Bug 2358 - Remove tests cnsn to xml and add tests nn to xml