build in first tests,
refactored parsing