Merge pull request #64 from rmansoor/master

BISERVER-8345 - Fixed some unit test failures
BISERVER-8345 - Fixing unit test