Fix up the last of the bogus test failures and delete a dumb test