(WIP) WS Unit Test Modifications for Downstream Server Responses

TODO comments will soon be turned into issues.
Did you forget about these?