finalize parser heuristics
add one test