Updated all tests to use AssertJ.