fixed cleanup code for tests no longer leaving any traces