Adds first passing test and finishes changes for Node compatibility