diff --git a/include/minja/minja.hpp b/include/minja/minja.hpp
index 9d9a1a0..8b6c243 100644
--- a/include/minja/minja.hpp
+++ b/include/minja/minja.hpp
@@ -1305,12 +1305,10 @@ struct ArgumentsExpression {
 };
 
 static std::string strip(const std::string & s) {
-  static std::regex trailing_spaces_regex("^\\s+|\\s+$");
-  return std::regex_replace(s, trailing_spaces_regex, "");
-  // auto start = s.find_first_not_of(" \t\n\r");
-  // if (start == std::string::npos) return "";
-  // auto end = s.find_last_not_of(" \t\n\r");
-  // return s.substr(start, end - start + 1);
+  auto start = s.find_first_not_of(" \t\n\r");
+  if (start == std::string::npos) return "";
+  auto end = s.find_last_not_of(" \t\n\r");
+  return s.substr(start, end - start + 1);
 }
 
 static std::string html_escape(const std::string & s) {
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e9a3f04..a41c995 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -83,12 +83,6 @@ set(MODEL_IDS
     # xai-org/grok-1
 )
 
-if(WIN32)
-    list(REMOVE_ITEM MODEL_IDS
-        bofenghuang/vigogne-2-70b-chat
-    )
-endif()
-
 # Create one test case for each {template, context} combination
 file(GLOB CONTEXT_FILES "${CMAKE_SOURCE_DIR}/tests/contexts/*.json")
 execute_process(