* Fixed a test so it passes properly on Windows.
* Minor changes as requested in PR #141