Fixing some goofs + moving tests over for more accurate cov numbers

Unrelated to this since this PR was just moving it, but would we want to namespace this env var?