Merge pull request #159 from rmansoor/master

BISERVER-8044 fixing unit tests
BISERVER-8044 - Fixing unit test