Convert all assertions to assertJ