[BISERVER-10767] Fix unit tests so they will run
Merge pull request #1207 from webdetails/BISERVER-10767

[BISERVER-10767] Fix unit tests so they will run