diff --git a/src/BaselineOfFASTPython/BaselineOfFASTPython.class.st b/src/BaselineOfFASTPython/BaselineOfFASTPython.class.st
index ff2cff1..1a22810 100644
--- a/src/BaselineOfFASTPython/BaselineOfFASTPython.class.st
+++ b/src/BaselineOfFASTPython/BaselineOfFASTPython.class.st
@@ -12,7 +12,10 @@ Class {
 BaselineOfFASTPython >> baseline: spec [
 
 	<baseline>
-	spec for: #common do: [ "Dependencies"
+	spec for: #common do: [ 
+			spec preLoadDoIt: #'preload:package:'.
+			
+			"Dependencies"
 			self
 				fast: spec;
 				treeSitter: spec.
@@ -40,6 +43,13 @@ BaselineOfFASTPython >> fast: spec [
 				repository: 'github://moosetechnology/FAST:v3/src' ]
 ]
 
+{ #category : 'actions' }
+BaselineOfFASTPython >> preload: loader package: packageSpec [
+	"For now we use the bleeding edge of tree-sitter-python"
+
+	(self class environment at: #TreeSitterLibraryBranchMap ifAbsentPut: [ Dictionary new ]) at: 'Python' put: 'master'
+]
+
 { #category : 'accessing' }
 BaselineOfFASTPython >> projectClass [
 	^ MetacelloCypressBaselineProject
@@ -47,6 +57,9 @@ BaselineOfFASTPython >> projectClass [
 
 { #category : 'dependencies' }
 BaselineOfFASTPython >> treeSitter: spec [
-	spec
-		baseline: 'TreeSitter' with: [ spec repository: 'github://Evref-BL/Pharo-Tree-Sitter:v.2.0.0/src' ]
+
+	spec baseline: 'TreeSitter' with: [
+			spec
+				repository: 'github://Evref-BL/Pharo-Tree-Sitter:v.2.1.2/src';
+				loads: #( 'moose' 'python' ) ]
 ]
diff --git a/src/FAST-Python-Tools-Tests/FASTPythonImporterTest.class.st b/src/FAST-Python-Tools-Tests/FASTPythonImporterTest.class.st
index 538a68a..a35ddf7 100644
--- a/src/FAST-Python-Tools-Tests/FASTPythonImporterTest.class.st
+++ b/src/FAST-Python-Tools-Tests/FASTPythonImporterTest.class.st
@@ -42,13 +42,6 @@ Class {
 	#tag : 'Importer'
 }
 
-{ #category : 'class initialization' }
-FASTPythonImporterTest class >> initialize [
-	"We ensure the installation of the library before running the tests because it could cause a time limit to fails for the test installing the libraries."
-
-	TSLibrariesPython new ensurePythonLibraryExists
-]
-
 { #category : 'test generation' }
 FASTPythonImporterTest class >> regenerateAllTests [
 
diff --git a/src/FAST-Python-Tools/FASTPythonTreeSitterVisitor.class.st b/src/FAST-Python-Tools/FASTPythonTreeSitterVisitor.class.st
index 8987c88..e1df2cc 100644
--- a/src/FAST-Python-Tools/FASTPythonTreeSitterVisitor.class.st
+++ b/src/FAST-Python-Tools/FASTPythonTreeSitterVisitor.class.st
@@ -25,13 +25,6 @@ Class {
 	#tag : 'Importing'
 }
 
-{ #category : 'class initialization' }
-FASTPythonTreeSitterVisitor class >> initialize [
-	"For now we use the bleeding edge"
-
-	TSLibrariesPython gitBranchToUse: 'master'
-]
-
 { #category : 'private' }
 FASTPythonTreeSitterVisitor >> handleBinaryOperator: aTSNode ofKind: aClass [