Ignore this test for 1.0-m3 again.
Minor tidy up.
Attempt to make this int test more robust on windows.