* env test fix - clean up all objects which might have been created during testing