Testcase and RHEL/CentOS related fixes