No Reviewer: Stabilise gemini tests

Tested by running the gemini tests ~20 times with no failures