Commit part of Matt Ezell's unit test fixes (pull request 159). Don't use a specific server name.