Fixed broken client tests and ignored some that need reworking.