Ability to override the Verify class

Continuation of #169, this includes the fixes I suggested.