fixed some of the unit tests
Got unit tests working but now broken again after merge with new parser code