Merge "Fixed hard-coded port 12345 in TestClient"