reorganized test/server.js