Add tests & msbuild