cleaned up watcher tests and incremented version