Lots of node test fixes

[rhlsthrm]

The Problem

The Solution

Checklist:

• I am making this PR against staging, not master
• My code follows the code style of this project.
• I have described any backwards-incompatibility implications above.
• I have highlighted which parts of the code should be reviewed most carefully.
• If my change requires a change to the documentation, I have updated it accordingly.