Add a branch for the new parser. Add tests from the spec.