Merge "Revert "Ensure that run-test preserves exit status""