Fixing unit tests
Merge pull request #456 from rmansoor/master

BISERVER-8044 fixing unit tests