Fix test typo
More tests and expression/parsing improvements and fixes