CPAN test fail fixes
Merge branch 'version-1.7'