more consistant test server names