Fixed a unit test bug.
Adding more structure to the parsing.