[Reviewer: Alex] Sto1001

Alex, can you review these changes to the live tests that cover the previous Gemini changes
Could you use barriers here?