Clean up and document the Watcher unit tests.