tests: Minor cleanup to get tests running.#1

winder merged 2 commits intomasteralgorand/conduit:masterfrom

will/2nd-passalgorand/conduit:will/2nd-passCopy head branch name to clipboard