fix bugs and finish the server.test.js…..