Added to parser internals (+ tests of internals)