new client/server class names in test scripts