Trying to keep the envvars through run-tests