Adds test support for Visual Studio
Simple merge