Fix identity verification RB

Combines the pull request features of @kohnston and @phlipper and some more tests for common form scenarios.