Rebase on Visual Studio 2013 Test