Change multiple functions and tests, in http and java client.