Maps parser + tests  + gates parser fix [skip ci]