[PTFM-8997] Rearrange test setup to avoid pinning DX_CLI_WD