Minor fixes to test package.
Minor fixes in RestClient.