Switch to AssertJ