Fixes bug in main parsing function.  Adds corresponding test. Comments-out old tests for functionality no longer in use.