New changes to server, test