diff --git a/.smalltalk.ston b/.smalltalk.ston
new file mode 100644
index 0000000..7350919
--- /dev/null
+++ b/.smalltalk.ston
@@ -0,0 +1,15 @@
+SmalltalkCISpec {
+  #loading : [
+    SCIMetacelloLoadSpec {
+      #baseline : 'FASTCSS',
+      #directory : 'src',
+      #platforms : [ #pharo ]
+    }
+  ],
+  #testing : {
+    #coverage : {
+      #packages : [ 'FAST-CSS*' ],
+      #format : #lcov
+    }
+  }
+}
diff --git a/src/BaselineOfFASTCSS/BaselineOfFASTCSS.class.st b/src/BaselineOfFASTCSS/BaselineOfFASTCSS.class.st
index a677383..31ec7dd 100644
--- a/src/BaselineOfFASTCSS/BaselineOfFASTCSS.class.st
+++ b/src/BaselineOfFASTCSS/BaselineOfFASTCSS.class.st
@@ -48,7 +48,7 @@ BaselineOfFASTCSS >> defineDependencies: spec [
 	spec baseline: 'TreeSitter' with: [
 		spec
 			loads: #( 'moose' 'css' );
-			repository: 'github://Evref-BL/Pharo-Tree-Sitter:v.2.1/src' ]
+			repository: 'github://Evref-BL/Pharo-Tree-Sitter:main/src' ]
 ]
 
 { #category : 'baselines' }
@@ -56,8 +56,7 @@ BaselineOfFASTCSS >> defineGroups: spec [
 
 	spec
 		group: 'core'
-		with: #( 'FAST-CSS-Model' 
-			   'FAST-CSS-Model-Generator' );
+		with: #( 'FAST-CSS-Model' 'FAST-CSS-Model-Generator' 'FAST-CSS-Tests' );
 		group: 'tools' with: #( 'core' 'FAST-CSS-Tools' )
 ]
 
@@ -68,6 +67,8 @@ BaselineOfFASTCSS >> definePackages: spec [
 		package: 'FAST-CSS-Model'
 		with: [ spec requires: #( 'FAST' ) ];
 		package: 'FAST-CSS-Model-Generator'; 
+		package: 'FAST-CSS-Tests'
+		with: [ spec requires: #( 'FAST-CSS-Model' ) ]; 
 		package: 'FAST-CSS-Tools'
 		with: [ spec requires: #( 'TreeSitter' ) ].
 
diff --git a/src/FAST-CSS-TestsGenerated/FASTCSSImporterTest.class.st b/src/FAST-CSS-Tests/FASTCSSImporterTest.class.st
similarity index 99%
rename from src/FAST-CSS-TestsGenerated/FASTCSSImporterTest.class.st
rename to src/FAST-CSS-Tests/FASTCSSImporterTest.class.st
index 9eea0d5..f797c81 100644
--- a/src/FAST-CSS-TestsGenerated/FASTCSSImporterTest.class.st
+++ b/src/FAST-CSS-Tests/FASTCSSImporterTest.class.st
@@ -1,8 +1,8 @@
 Class {
 	#name : 'FASTCSSImporterTest',
 	#superclass : 'TSFASTAbstractImporterTest',
-	#category : 'FAST-CSS-TestsGenerated',
-	#package : 'FAST-CSS-TestsGenerated'
+	#category : 'FAST-CSS-Tests',
+	#package : 'FAST-CSS-Tests'
 }
 
 { #category : 'tests' }
diff --git a/src/FAST-CSS-Tests/package.st b/src/FAST-CSS-Tests/package.st
new file mode 100644
index 0000000..53f573e
--- /dev/null
+++ b/src/FAST-CSS-Tests/package.st
@@ -0,0 +1 @@
+Package { #name : 'FAST-CSS-Tests' }
diff --git a/src/FAST-CSS-TestsGenerated/package.st b/src/FAST-CSS-TestsGenerated/package.st
deleted file mode 100644
index eee837c..0000000
--- a/src/FAST-CSS-TestsGenerated/package.st
+++ /dev/null
@@ -1 +0,0 @@
-Package { #name : 'FAST-CSS-TestsGenerated' }