Got the tests to build under MSVC.
Self-review.
Fixed issue on 32-bit linux.