- Added concrete syntax.
- Rewritten tests to use concrete syntax.