Remove the server-/client- prefixes in the tests.