added tests
merge server.js