updates to testserver and client