Fixed test cleanup
It's now public