Added test configurations and data.
Refactoring of parsers