upgrade to kadira, improve client tests