Cosmetic: Minor cleanup of server error testing
Cosmetic: Minor cleanup of server error testing

I mostly just moved some things around so they're in places that are
more logical.

Ritsyy/fjord,staranjeet/fjord,hoosteeno/fjord,hoosteeno/fjord,lgp171188/fjord,Ritsyy/fjord,hoosteeno/fjord,lgp171188/fjord,lgp171188/fjord,mozilla/fjord,Ritsyy/fjord,lgp171188/fjord,mozilla/fjord,rlr/fjord,mozilla/fjord,hoosteeno/fjord,staranjeet/fjord,rlr/fjord,staranjeet/fjord,mozilla/fjord,Ritsyy/fjord,staranjeet/fjord,rlr/fjord,rlr/fjord