diff --git a/core/agents/task_reviewer.py b/core/agents/task_reviewer.py
index 7c0aa9830..f6b3999a4 100644
--- a/core/agents/task_reviewer.py
+++ b/core/agents/task_reviewer.py
@@ -47,7 +47,7 @@ async def review_code_changes(self) -> AgentResponse:
         )
         llm_response: str = await llm(convo, temperature=0.7)
 
-        if "done" in llm_response.strip().lower()[-7:]:
+        if "done" in llm_response.strip().lower()[-20:]:
             return AgentResponse.done(self)
         else:
             return AgentResponse.task_review_feedback(self, llm_response)
diff --git a/core/templates/registry.py b/core/templates/registry.py
index f52f89b89..a07a25a39 100644
--- a/core/templates/registry.py
+++ b/core/templates/registry.py
@@ -2,8 +2,10 @@
 
 from core.log import get_logger
 
+from .javascript_react import JavascriptReactProjectTemplate
 from .node_express_mongoose import NodeExpressMongooseProjectTemplate
-from .react_express import ReactExpressProjectTemplate
+
+# from .react_express import ReactExpressProjectTemplate
 
 log = get_logger(__name__)
 
@@ -11,13 +13,13 @@
 class ProjectTemplateEnum(str, Enum):
     """Choices of available project templates."""
 
-    # JAVASCRIPT_REACT = JavascriptReactProjectTemplate.name
+    JAVASCRIPT_REACT = JavascriptReactProjectTemplate.name
     NODE_EXPRESS_MONGOOSE = NodeExpressMongooseProjectTemplate.name
-    REACT_EXPRESS = ReactExpressProjectTemplate.name
+    # REACT_EXPRESS = ReactExpressProjectTemplate.name
 
 
 PROJECT_TEMPLATES = {
-    # JavascriptReactProjectTemplate.name: JavascriptReactProjectTemplate,
+    JavascriptReactProjectTemplate.name: JavascriptReactProjectTemplate,
     NodeExpressMongooseProjectTemplate.name: NodeExpressMongooseProjectTemplate,
-    ReactExpressProjectTemplate.name: ReactExpressProjectTemplate,
+    # ReactExpressProjectTemplate.name: ReactExpressProjectTemplate,
 }
diff --git a/tests/templates/test_templates.py b/tests/templates/test_templates.py
index 25d61741a..dd21a7866 100644
--- a/tests/templates/test_templates.py
+++ b/tests/templates/test_templates.py
@@ -6,6 +6,7 @@
 from core.templates.registry import PROJECT_TEMPLATES
 
 
+@pytest.mark.skip
 @pytest.mark.asyncio
 @patch("core.state.state_manager.get_config")
 async def test_render_react_express_sql(mock_get_config, testmanager):
@@ -30,6 +31,7 @@ async def test_render_react_express_sql(mock_get_config, testmanager):
     assert "api/models/user.js" not in files
 
 
+@pytest.mark.skip
 @pytest.mark.asyncio
 @patch("core.state.state_manager.get_config")
 async def test_render_react_express_nosql(mock_get_config, testmanager):