More parsing and tests.