And add a bunch of tests, including one that runs into the verifier check added previously without this change.