[BISERVER-10767] Backport of BISERVER-10767 - Fix unit tests so they will run
Merge pull request #1259 from webdetails/BISERVER_10767

[BISERVER-10767] Backport of BISERVER-10767 - Fix unit tests so they wil...