Merge "Add a delay between tests to make them more robust" into rvc-dev