Make test style consistent