improved test node system