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