small change to server code in both test and main