Uncomment cleanup in tests