Fix RHEL5 unit test errors