Merge "Fix run-test"