orig_test_id should be set properly. Also fixed sporadic test failure.
Attach a file by drag & drop or click to upload
