Merge "recovery: Refactor verifier and verifier_test."