BISERVER-10923 - Fixing some unit tests
Merge pull request #1177 from rmansoor/master

BISERVER-10923 - Fixing some unit tests