Removed parsers
Modified unit tests according to modeler change
Pep8 modification