Fixing MSVC unit testing for new format