parser: Update expression parser and implement unit test