More tests and refactoring for call verifier.