See #775. Plus enhanced manual windows test programs'
merge