fix test isolation problem and no env variables set problem
Merge branch 'dx_support'