Updates for running unit tests on rhel 6