Fix style errors that broke the tests