Bunch of fixes in mocks and watcher