refactor verifiers tests
verifiers are to be callables
separate singletons to classes and instances