Cosmetics changes + fix unit test