Tweak watcher tests; ignore manifest in rspec tests