OpenShift and WS tests update