Conflates some REST and WebSocket test fixes. Still in garbage pile baselining mode I guess.