Merge "dx: update run-test script and expectations"