Reduce some flakiness in the test