Test clean-up/fixes to address CPAN test failures.