Got the tests to pass - finally.

Thanks to haarg from irc.perl.org .