Fix test style issues