Update to current state of test-server code.