Client test fixes