Update the captcha service including tests