diff --git a/cxx b/cxx
index 7c4ac436..7992af70 160000
--- a/cxx
+++ b/cxx
@@ -1 +1 @@
-Subproject commit 7c4ac436e47cd15beed304cad2b8151d50a1efd1
+Subproject commit 7992af7010b7654c115510938a2f7626204bf936
diff --git a/location/tox.ini b/location/tox.ini
index dbb7b77b..c625edbc 100644
--- a/location/tox.ini
+++ b/location/tox.ini
@@ -1,13 +1,17 @@
 [tox]
 minversion = 4.0
 
+[common]
+deps =
+    pytest>=6
+    pytest-cov
+
 [testenv]
 description = run the tests with pytest
 package = wheel
 wheel_build_env = .pkg
 deps =
-    pytest>=6
-    pytest-cov
+    {[common]deps}
     # The packages it depends on come from this checkout rather than a
     # package index, so the tests run with the code they are released with.
     -e../pipeline/fiftyone_pipeline_core/
@@ -21,8 +25,11 @@ pass_env =
     _51DEGREES_LICENSE_KEY
     license_key
 
+# Tests the packages just built, so it takes the test tools from [common]
+# and every package from the requirements file, never the editable copies
+# above, which pip refuses beside a built copy of the same package.
 [testenv:pre-publish]
 package = skip
 deps =
-    {[testenv]deps}
+    {[common]deps}
     -r ../../package/pre-publish-requirements.txt
diff --git a/pipeline/fiftyone_pipeline_core/src/fiftyone_pipeline_core/js_templates b/pipeline/fiftyone_pipeline_core/src/fiftyone_pipeline_core/js_templates
index c773ce22..41e7561f 160000
--- a/pipeline/fiftyone_pipeline_core/src/fiftyone_pipeline_core/js_templates
+++ b/pipeline/fiftyone_pipeline_core/src/fiftyone_pipeline_core/js_templates
@@ -1 +1 @@
-Subproject commit c773ce221ccec6fcb67fbdd5ad2175a66fab11d6
+Subproject commit 41e7561f82dd4a3a498e6b16d81d2c5cdbcdda8a