Cleaner test style