Updated tests to deal with multiple nodes.