stateful server changes to tests