Wip/rhel7 tests