Final phase of refactoring OpenShift tests
"