Prepare for Xcode 6
Fix TestClient method signature