Merge "Stop test from randomly failing"