Rework the request/response mechanism
Apply changes to the requests unit tests