add cleaner to index.js, update test fixtures