Fleshing out the parser.
Add six to test requirements.
Fixed tests.