more robust node testing
more robust node testing


Former-commit-id: f2a55ce75b5c7ab40ef017cb7eb20b6224687c1d [formerly 7ef370b120cdd21a4f07b4ed8a66fc7937852403]
Former-commit-id: 170fe82ce6a40e0a257796b12fab47c438b4dfb4
andrewplummer/Sugar,andrewplummer/Sugar,romancow/Sugar,romancow/Sugar