Updated client and test