Fix WS tests