Updated client and created tests
Updated client and created tests