change style and fix test