fix intermittently failing base catchup tests
Merge pull request #366 from Incubaid/fix-base-catchup-tests

fix intermittently failing base catchup tests