Added deletion of orphans to the cleanup
Added search consumer testcase