Fixing unit tests on RHEL6

Change-Id: I73845f9a2d6fd9318380395f61b1b0ea76c393cc