adjust to nodetype test class cleanup