Normalize most of the client/server tests.