CPAN/tests - more fixes for versions, some code changes