#1744 use nodelist
#1744 clean up
#1744 add test
#1744 can't use this test anymore