- fixed annotations,
- cleaned FormTypeParserTest