client test fixes