diff --git a/.gitignore b/.gitignore
index 1a6c14a8..f34c7c75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 *.DS_Store
 build/
 /.vs
-.vscode/
 .history/
 /imprint/CMakeSettings.json
 CMakeCache.txt
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index cd0065f6..d8228843 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -15,11 +15,10 @@ repos:
     rev: 3.8.4
     hooks:
       - id: flake8
-  - repo: https://github.com/pycqa/isort
-    rev: 5.7.0
+  - repo: https://github.com/asottile/reorder_python_imports
+    rev: v3.8.1
     hooks:
-      - id: isort
-        name: isort (python)
+      - id: reorder-python-imports
   - repo: https://github.com/mwouts/jupytext
     rev: v1.13.8
     hooks:
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 1b12e1c1..186042d0 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -7,8 +7,10 @@
                 "${workspaceFolder}/imprint/include",
                 "${workspaceFolder}/bazel-imprint/external/eigen",
                 "${workspaceFolder}/bazel-imprint/external/fmtlib/include",
-                "${workspaceFolder}/bazel-imprint/external/boost",
-                "${workspaceFolder}/bazel-imprint/external/pybind11/include"
+                "${workspaceFolder}/bazel-imprint/external/com_github_scipy_boost/",
+                "${workspaceFolder}/bazel-imprint/external/pybind11/include",
+                "${workspaceFolder}/bazel-imprint/external/com_github_google_benchmark/include",
+                "${workspaceFolder}/bazel-imprint/external/com_google_googletest/googletest/include"
             ],
             "defines": [],
             "compilerPath": "/usr/bin/clang",
@@ -23,8 +25,11 @@
                 ],
                 "limitSymbolsToIncludedHeaders": true
             },
+            "forcedInclude": [
+                "${workspaceFolder}/.vscode/eigen_fix.h"
+            ],
             "compileCommands": "${workspaceFolder}/compile_commands.json"
         }
     ],
     "version": 4
-}
+}
\ No newline at end of file
diff --git a/.vscode/eigen_fix.h b/.vscode/eigen_fix.h
new file mode 100644
index 00000000..a70f248a
--- /dev/null
+++ b/.vscode/eigen_fix.h
@@ -0,0 +1,10 @@
+/*
+ * Proposed fix with IntelliSense that keeps raising error with Eigen classes
+ * about incomplete types.
+ * https://github.com/microsoft/vscode-cpptools/issues/7413#issuecomment-1105063602
+ * This file is force-included in c_cpp_properties.json.
+ */
+#if __INTELLISENSE__
+#undef __ARM_NEON
+#undef __ARM_NEON__
+#endif
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 59c82788..af9b6d59 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -114,5 +114,7 @@
     },
     "C_Cpp.errorSquiggles": "Enabled",
     "editor.formatOnSave": false,
-    "cmake.configureOnOpen": false
+    "cmake.configureOnOpen": false,
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
 }