rework TestWatcherBasic with new testing utils
Reconfigure Travis CI to build under Mac OS X