make watchServer test *almost* work
Add handlers for the other request types