Minor fixes to pass test_server.py tests, excise ExceptHookThread