testing made cleaner