Got most of the unit tests working for new parser that uses reader. Just missing the new ones I added see TODO on  new unit test.