Refactor tests for the new syntax.
Big refactoring for new syntax.
Add simple test harness.