Add expression parsing, better test errors.