rework TestWatcherBasic with new testing utils