Merge branch 'kk/tests-with-no-perl'