Add id parsing for primary expressions, tests