--Test Fixes.
Merge pull request #691 from PoonamNalawade/HR-testfixes

--Test Fixes.