Merge "Add test coverage for cleanup bug to be fixed."