[BISERVER-10923] Fix platform unit tests
Merge pull request #1226 from mdamour1976/master

[BISERVER-10923] Fix platform unit tests