Fix up the test suite

This should fix test failures on Windows like
http://www.cpantesters.org/cpan/report/45bd1491-6dbe-1014-90cd-422ae79c0688
Released 1.22