Speed up WS test