(WIP) WS Unit Test Modifications for Downstream Server Responses

TODO comments will soon be turned into issues.
This is the only line that /must/ be kept, and could be moved down to just under line 373