Fixup tests

Should be able to factor out some of the old code now that I know what this
is actually supposed to do here.