Added test to VS build, related fixes
Relates to #46, passing on VS now