extra/cleaner test functionality