Adjust testsuite to match mergerequest!14.
Testsuite passes on native Linux. Test suite not expected to pass on Windows at the moment.
Merge details
merged
mentioned in commit 9ed98b1b
Thanks!