Remove unused nodelist, tweaks tests