Fixes in cleanup operation / down operation tests
Merge branch 'master' into fix-watch-notif