Fixed test cleanup.