cleanertest version 2