ws
more fixes for dev tests