Add AssertJ and fix broken unit test