Beefed up server/client integration tests.