Replace __cv_unique_string with __unique_string in General_CV and ridge
tests