(WIP) WS Unit Test Modifications for Downstream Server Responses

TODO comments will soon be turned into issues.
Best to have an extension that does it for you.