stabilizing SingleNode*Tests - clean up per Mark Fishers comments