Describe the enhancement requested

Through out the unit tests, we have a mix usage of assertj and hamcrest and specifically in dataset and flight modules, hamcrest is being widely used. That must be replaced with assertj.

Component(s)

Java