Improved testing, still need to improve NodesTable