Paul Vriens : rsaenh/tests: Fix some test failures on NT4 and lower.