Try to fix intermittent timeout in tests