fixing some of the unit tests too. CndParserTest still broken.