Implemented new Client tests