Update tests to support multi-server APIs.