Get test passing on Windows.
Fix 2.5 compat in test.