Fixed test cleanup