Updated test and client.