Improve client tests