Fixing ClientRepository tests