Fix style & get tests passing.