Change AssertJ version
Change equals methods