Fix style violation and broken test.