Update to fix unit tests on RHEL 5