Work on node module support
Rewrote tests to use node