Merge "[Tempest] Fix concurrency issue in scenario test"