Fix and test parser

Michiel Cottaarrequested to merge
fix-parser into main

Merge request reports