OpenShift: New tests and refactoring