Merge pull request microsoft#198 from mousetraps/i120

Fix microsoft#120 VS2015 Break on exception does not work with Error() by default

Merge pull request microsoft#111 from mousetraps/i19

microsoft#19 Test discovery is not working when default processor architecture is