Attempt to fix test failures that only repro on CircleCI
Attempt to fix test failures that only repro on CircleCI

pickettd/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org,pickettd/code-dot-org