Merge "Extra debug output in run-test."