Further work on testing client.