Refined the Cleanup method to make sure the task was complete.
Added new test that runs for cleaning up