simplify client tests