OpenShift tests rewritten to be modular