Renamed test-handler to test-client.