Converted tests to use AssertJ