WS cleanup
WS tests