Fix test errors.