Merge pull request #415 from daleharvey/remove-node-cruft

Bug 392 - Remove node specific adapters in tests
Merge branch 'master' into 416-linting-to-tests