Fixes in cleanup operation / down operation tests