More simple creating in tests for cleanup