changes to server, along with random serializable test