All original tests updated. Minor changes to index.js