minor changes
Added a few tests to cover parsing