+ spacing
get tests to run with node.js too.