flaky test fix? Is there a better way?