Fixing Flaky Tests In CircleCI

Post available here.