Switch WatcherTest name and fix more bitrot
Merge branch 'dependencies' of https://github.com/jarrett/ichiban into dependencies
Test Suite for new dependencies module