(WIP) WS Unit Test Modifications for Downstream Server Responses

TODO comments will soon be turned into issues.
So basically you moved this test up and deleted the one that was there originally. Why?