Standardise naming of test vars
Add check for Node.handler