refactor parser spec a bit