Make test cleaner