DASCTEST-168 Rationalize test environment