[WIP] Fixes to tests and RHEL7 support.