Changed from XUnit to VS Unit Test Framework