Fix styles and tests