Add client id and tests