fix tests; added selective cleanup test.