Enable unit tests to build with MSVC

Change-Id: Ie80597221bee494679ae2ba50cca22dea2609cba
2 files changed