OpenShift new tests and fixes