OpenShift tests packages refactoring