Reorder node tests, clean up node header