More utility classes moved from parsers to api
tests refactored to remove Factory