Added test_verify, more cleanup

Cleanup