Reworked server code.
Reworked server code.
Corrected WS testing.