builds, but in flight DTMarkdownParser:198
fixed tests, refactoring
refactor a bit for readability