fixing name typo
instead of using the tokens directly from the tokenizer we map them to an enum first
adding testcases for psh