Code Cleanup
Increase timeout on watcher fixture's wait()