BISERVER-10923 - Fix platform unit tests
Merge pull request #1196 from brendan-lynch/CoreTests

BISERVER-10923 - Fix platform unit tests