Fix: Fix syntax to pass linters and wrap verify in a try-catch
Add: tests