Tidied client/server Gemfire tests