Fix additional compilation errors in unit tests for VC