make watchServer test *almost* work