modified server.js, test.js