Encapsulate request and response more sanely
Fix broken threaded test