Add new cleanup test
Added two more recursive watcher test