Move over to using AssertJ completely