Don't use stub class in Node tests
Merge branch 'refactor-node-test'