Tom Lee

Fixed the MSVC/Win2016 build failures, but I don't think this PR caused the most recent MacOS build failure.

@pepijndevos that's correct, the tests need to be modified and I've been slow to get back to this after failing to force a clean shutdown in the tests. I'll see...

Added sample and demo files to get tests passing, not sure I fully understand the intent/difference between the demo and sample files but I'll eyeball that a little later.