Fix Cleanup task
Add test for Cleanup task