Merge branch 'jt/submodule-tests-cleanup'