[BISERVER-11333] Fixing unit test compilation errors
Merge pull request #2139 from mdamour1976/master

[BISERVER-11333] Fixing unit test compilation errors