parsers tests + refactoring