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