Add tests for verify and finish