Future refactor to separate test server types