refactor parser matcher: tests 150x more fast