Do not discard key for validation error when converting to error map
Add a test for form validation
Merge pull request #620 from benmccann/validation-fix

Do not discard key for validation error when converting to error map