Test coverage up to 72% on the parser