OpenShift and WS tests update

- mostly minor fixes, stability issues, logic...