Re-org to make parsing more easily testable
Start to add more tests and fix a parser bug.