Synced core & dsl grammar, added unit tests.