Moving to AssertJ guava