fixed ws related tests