Add tests for verify and finish
Add tests to verify. Fix error reporting in verify.
Merge branch 'develop'