fix parsing errors with builtin symbols, pass initial tests