Version 2 metadata.
Finishing test cases and fixing a DSL bug.