rework TestWatcherBasic with new testing utils (#53)