OpenShift tests update to Beta3, some refactoring