Merge branch 'dt/tests-with-env-not-subshell'