Merged test.js with index.js for some tests