adjust tests for cleanup