Unbreaking the MSVC 2012 build; however, these tests still fail on Windows.