Merge branch 'jk/tests-cleanup'