Merge branch 'jk/wrap-perl-used-in-tests'