Update to AssertJ 1.6.1