Corrected tests and perlcritic issues