update more test files to use new node structure