Fix flaky TestOpGet and TestSyncCreateTimeout
Merge pull request #858 from lavalamp/fix

Fix flaky TestOpGet