Continuing CleanupOperation; test-driven