Reapply AssertJ refactoring