Extracted helper parsers to separate module
Created separate target for test coverage