Convert to class method verify_type_string
Fix test
Merge branch 'hotfix/email-provider-fix' into develop