Adding test and msbuild