Client test changes