[BISERVER-10602] fixing unit tests
Merge pull request #1282 from mdamour1976/5.0

[BISERVER-10602] fixing unit tests