some more tweaks to GeneralTests for RHEL511