Fix clients to return expected values