diff --git a/gtoolkit/run.sh b/gtoolkit/run.sh
index 8f997bfe..28ebd60e 100644
--- a/gtoolkit/run.sh
+++ b/gtoolkit/run.sh
@@ -176,13 +176,19 @@ gtoolkit::load_project() {
         metacello := Metacello new
             baseline: 'SmalltalkCI';
             repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
-            onUpgrade: [ :ex | ex useIncoming ].
+            onUpgrade: [ :ex | ex useIncoming ];
+            ignoreImage.
         (Metacello canUnderstand: #onConflictUseIncoming)
             ifTrue: [ metacello onConflictUseIncoming ]
             ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-        metacello load ]
-            on: Warning
-            do: [ :w | w resume ].
+                ([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
+                  on: KeyNotFound
+                  do: [ :keyEx | keyEx resumeUnchecked: nil ])
+                    ifNil: [ metacello load ]
+                    ifNotNil: [ :exceptionClass |
+                      [ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
+                        on: Warning
+                        do: [ :w | w resume ].
     smalltalkCI := Smalltalk at: #SmalltalkCI.
     smalltalkCI load: '$(resolve_path "${config_ston}")'.
     (smalltalkCI isHeadless or: [ smalltalkCI promptToProceed ])
@@ -205,13 +211,19 @@ gtoolkit::test_project() {
                 metacello := Metacello new
                     baseline: 'SmalltalkCI';
                     repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
-                    onUpgrade: [ :ex | ex useIncoming ].
+                    onUpgrade: [ :ex | ex useIncoming ];
+                    ignoreImage.
                 (Metacello canUnderstand: #onConflictUseIncoming)
                     ifTrue: [ metacello onConflictUseIncoming ]
                     ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-                metacello load ]
-                    on: Warning
-                    do: [ :w | w resume ].
+                ([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
+                  on: KeyNotFound
+                  do: [ :keyEx | keyEx resumeUnchecked: nil ])
+                    ifNil: [ metacello load ]
+                    ifNotNil: [ :exceptionClass |
+                      [ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
+                        on: Warning
+                        do: [ :w | w resume ].
             Smalltalk at: #SmalltalkCI ].
     smalltalkCI test: '$(resolve_path "${config_ston}")'
   "
diff --git a/pharo/run.sh b/pharo/run.sh
index 7284a7b3..33534207 100644
--- a/pharo/run.sh
+++ b/pharo/run.sh
@@ -367,13 +367,19 @@ pharo::load_project() {
         metacello := Metacello new
             baseline: 'SmalltalkCI';
             repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
-            onUpgrade: [ :ex | ex useIncoming ].
+            onUpgrade: [ :ex | ex useIncoming ];
+            ignoreImage.
         (Metacello canUnderstand: #onConflictUseIncoming)
             ifTrue: [ metacello onConflictUseIncoming ]
             ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-        metacello load ]
-            on: Warning
-            do: [ :w | w resume ].
+        ([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
+          on: KeyNotFound
+          do: [ :keyEx | keyEx resumeUnchecked: nil ])
+            ifNil: [ metacello load ]
+            ifNotNil: [ :exceptionClass |
+              [ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
+                on: Warning
+                do: [ :w | w resume ].
     smalltalkCI := Smalltalk at: #SmalltalkCI.
     smalltalkCI load: '$(resolve_path "${config_ston}")'.
     (smalltalkCI isHeadless or: [ smalltalkCI promptToProceed ])
@@ -395,13 +401,19 @@ pharo::test_project() {
                 metacello := Metacello new
                     baseline: 'SmalltalkCI';
                     repository: 'filetree://$(resolve_path "${SMALLTALK_CI_HOME}/repository")';
-                    onUpgrade: [ :ex | ex useIncoming ].
+                    onUpgrade: [ :ex | ex useIncoming ];
+                    ignoreImage.
                 (Metacello canUnderstand: #onConflictUseIncoming)
                     ifTrue: [ metacello onConflictUseIncoming ]
                     ifFalse: [ metacello onConflict: [ :ex | ex useIncoming ] ].
-                metacello load ]
-                    on: Warning
-                    do: [ :w | w resume ].
+                ([ Smalltalk at: #MetacelloIgnorePackageLoaded ]
+                  on: KeyNotFound
+                  do: [ :keyEx | keyEx resumeUnchecked: nil ])
+                    ifNil: [ metacello load ]
+                    ifNotNil: [ :exceptionClass |
+                      [ metacello load ] on: exceptionClass do: [ :ex | ex resume: true ] ] ]
+                        on: Warning
+                        do: [ :w | w resume ].
             Smalltalk at: #SmalltalkCI ].
     smalltalkCI test: '$(resolve_path "${config_ston}")'
   "
diff --git a/repository/SmalltalkCI-Pharo-Core.package/.filetree b/repository/SmalltalkCI-Pharo-Core.package/.filetree
index 8998102c..57a67973 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/.filetree
+++ b/repository/SmalltalkCI-Pharo-Core.package/.filetree
@@ -1,4 +1,5 @@
 {
-	"noMethodMetaData" : true,
 	"separateMethodMetaAndSource" : false,
-	"useCypressPropertiesFile" : true }
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName..st
similarity index 100%
rename from repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName.st
rename to repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/instance/authorName..st
diff --git a/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/methodProperties.json
deleted file mode 100644
index ab6e8495..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/methodProperties.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"class" : {
-		 },
-	"instance" : {
-		"authorName:" : "HernanMoralesDurand 28/8/2024 04:56" } }
diff --git a/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/properties.json b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/properties.json
index e40cfd16..96d557fa 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/IceMetacelloPharoPlatform.extension/properties.json
@@ -1,2 +1,3 @@
 {
-	"name" : "IceMetacelloPharoPlatform" }
+	"name" : "IceMetacelloPharoPlatform"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoCustomScript.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoCustomScript.class/methodProperties.json
deleted file mode 100644
index e97a5df1..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoCustomScript.class/methodProperties.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"class" : {
-		"isPlatformCompatible" : "fn 11/1/2017 11:43" },
-	"instance" : {
-		"fileInFrom:" : "fn 11/1/2017 14:05" } }
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoCustomScript.class/properties.json b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoCustomScript.class/properties.json
index 8c9efdfb..ad53457e 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoCustomScript.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoCustomScript.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCIPharoCustomScript",
-	"pools" : [
-		 ],
 	"super" : "SCICustomScript",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharoCustomScript",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMetacelloLoadSpec.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMetacelloLoadSpec.class/methodProperties.json
deleted file mode 100644
index 7e73c11d..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMetacelloLoadSpec.class/methodProperties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"class" : {
-		"isPlatformCompatible" : "MaxLeske 7/11/2017 22:19" },
-        "instance" : {
-	        "registerInIceberg:" : "Hogoww 11/01/2023 06:47",
- 	        "registerInIceberg" : "Hogoww 11/01/2023 06:47",
-   	        "repositorySchemeIn:" : "fn 1/8/2021 17:12:57",
-		"withLoadWarningsHandlerDo:" : "MaxLeske 7/11/2017 22:14" } }
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMetacelloLoadSpec.class/properties.json b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMetacelloLoadSpec.class/properties.json
index 42a1af6b..afe9b1a1 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMetacelloLoadSpec.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMetacelloLoadSpec.class/properties.json
@@ -1,15 +1,13 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-        "instvars" : [
-	      "registerInIceberg"
-		 ],
-	"name" : "SCIPharoMetacelloLoadSpec",
-	"pools" : [
-		 ],
 	"super" : "SCIMetacelloLoadSpec",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [
+		"registerInIceberg"
+	],
+	"name" : "SCIPharoMetacelloLoadSpec",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMonticelloLoadSpec.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMonticelloLoadSpec.class/methodProperties.json
deleted file mode 100644
index 6576882e..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMonticelloLoadSpec.class/methodProperties.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"class" : {
-		"isPlatformCompatible" : "fn 6/13/2016 09:24" },
-	"instance" : {
-		"extractVersionsFromPackages:" : "fn 6/13/2016 09:29",
-		"loadVersion:repository:" : "fn 10/11/2016 21:20" } }
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMonticelloLoadSpec.class/properties.json b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMonticelloLoadSpec.class/properties.json
index ce434b37..e8d3d9e8 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMonticelloLoadSpec.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoMonticelloLoadSpec.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCIPharoMonticelloLoadSpec",
-	"pools" : [
-		 ],
 	"super" : "SCIMonticelloLoadSpec",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharoMonticelloLoadSpec",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/class/runClasses.spec..st b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/class/runClasses.spec..st
index d5062b26..ac02901f 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/class/runClasses.spec..st
+++ b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/class/runClasses.spec..st
@@ -1,10 +1,23 @@
 running
 runClasses: aCollectionOfClasses spec: aSCISpec
-  | suite classes |
-  suite := TestSuite named: aSCISpec name.
-  classes := (aCollectionOfClasses
-    select: [ :each | (each includesBehavior: TestCase) and: [ each isAbstract not ] ])
-      asSortedCollection: [ :a :b | a name <= b name ].
-  classes
-    do: [ :each | suite addTest: each suite ].
-  ^ self runSuite: suite spec: aSCISpec
+
+	| suite classes resources |
+	suite := TestSuite named: aSCISpec name.
+	classes := (aCollectionOfClasses select: [ :each |
+		            (each includesBehavior: TestCase) and: [
+			            each isAbstract not ] ]) asSortedCollection: [ :a :b |
+		           a name <= b name ].
+
+	resources := OrderedCollection new.
+	classes do: [ :class |
+		| classSuite |
+		classSuite := class suite.
+		resources addAll: (classSuite resources reject: [ :resource |
+				 resources includes: resource ]).
+		"Reset resources of nested suit. Resources are managed by the outermost suite."
+		classSuite resources: #(  ).
+		suite addTest: classSuite ].
+
+	suite resources: resources.
+
+	^ self runSuite: suite spec: aSCISpec
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/methodProperties.json
deleted file mode 100644
index 2ef503f5..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/methodProperties.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"instance" : {
-		"selectorIn:" : "GOC 5/22/2023 17:51",
-		"basicRunCase:" : "7/17/2017 19:03:43",
-		"serializeError:of:" : "GOC 5/22/2023 17:51",
-		"runAll" : "MaxLeske 7/17/2017 19:05",
-		"stackTraceString:of:" : "GOC 5/22/2023 17:51"
-	},
-	"class" : {
-		"runClasses:spec:" : "maxmattone 4/14/2021 17:11",
-		"skipExceptions" : "EstebanLorenzano 5/27/2021 21:51"
-	}
-}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/properties.json b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/properties.json
index f0f9c653..9eff49b1 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunner.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCIPharoTestRunner",
-	"pools" : [
-		 ],
 	"super" : "SCITestRunner",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharoTestRunner",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo10.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo10.class/methodProperties.json
deleted file mode 100644
index 19939230..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo10.class/methodProperties.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"instance" : {
-		"selectorIn:" : "GOC 5/22/2023 17:52"
-	},
-	"class" : { }
-}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo10.class/properties.json b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo10.class/properties.json
index b6f627a6..525883b1 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo10.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo10.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCIPharoTestRunnerPharo10",
-	"pools" : [
-		 ],
 	"super" : "SCIPharoTestRunnerPharo9",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharoTestRunnerPharo10",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo9.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo9.class/methodProperties.json
deleted file mode 100644
index 7351022c..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SCIPharoTestRunnerPharo9.class/methodProperties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"instance" : {
-		"stackTraceString:of:" : "GOC 5/22/2023 17:51"
-	},
-	"class" : {
-		"skipExceptions" : "CompatibleUserName 5/12/2023 06:02:08"
-	}
-}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo.class/methodProperties.json
deleted file mode 100644
index 1a394e98..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo.class/methodProperties.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-	"class" : {
-		"allPackageNames" : "fn 6/22/2016 00:44",
-		"assureDirectoryExistence:" : "smalltalkCI 9/2/2020 17:32",
-		"classesFrom:" : "fn 6/22/2016 00:32",
-		"classesInPackage:" : "fn 11/23/2016 11:33",
-		"deleteFile:" : "fn 10/16/2016 15:56",
-		"deprecationWarning" : "GOC 10/3/2019 10:26",
-		"extensionMethodsInPackage:" : "ct 10/14/2022 17:36",
-		"fileExists:" : "fn 4/14/2016 00:56",
-		"forceNewFileNamed:do:" : "EstebanLorenzano 5/27/2021 21:49",
-		"getAuthor" : "fn 6/13/2016 13:49",
-		"getEnv:" : "fn 10/9/2016 21:32",
-		"hash:maxLength:" : "fn 10/16/2016 17:25",
-		"imagePath" : "fn 9/27/2016 20:13",
-		"isHeadless" : "fn 1/27/2016 17:04",
-		"isPlatformCompatible" : "GuillermoPolito 10/6/2017 11:58",
-		"methodDictOf:" : "fn 10/4/2016 17:25",
-		"packageNamed:ifAbsent:" : "fn 11/23/2016 11:32",
-		"pathNameDelimiter" : "fn 6/25/2016 00:21",
-		"platformNameBeginsWith:" : "fn 12/5/2018 20:26",
-		"platformSymbol" : "EstebanLorenzano 1/26/2016 17:36",
-		"promptToProceedImpl" : "LM 9/4/2020 14:56",
-		"quitImage" : "fn 10/11/2016 18:43",
-		"readOnlyFileNamed:do:" : "fn 11/20/2017 13:31",
-		"saveImage" : "fn 10/4/2016 16:34",
-		"stdout" : "EstebanLorenzano 5/27/2021 21:49",
-		"stringFor:maxDecimalPlaces:" : "fn 9/28/2016 11:48",
-		"testRunnerClass" : "fn 10/4/2016 17:21",
-		"workingDirectory" : "fn 10/16/2016 16:28" },
-	"instance" : {
-		"adjustDefaultTimeoutIfRequested" : "fn 2/5/2018 10:18",
-		"basicLoad" : "GabrielOmarCotelli 4/15/2018 09:01",
-		"imageInfo" : "EstebanLorenzano 5/27/2021 21:49",
-		"prepareForTesting" : "fn 2/5/2018 10:09",
-		"readSTONSpec:" : "fn 11/20/2017 13:49",
-		"spec:" : "fn 11/20/2017 21:07",
-		"suiteName:" : "EstebanLorenzano 5/27/2021 21:49" } }
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo.class/properties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo.class/properties.json
index 7994a6b4..83a3f586 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo.class/properties.json
@@ -1,14 +1,15 @@
 {
+	"commentStamp" : "",
+	"super" : "SmalltalkCI",
 	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
+	"classinstvars" : [ ],
+	"pools" : [ ],
 	"classvars" : [
-		"StdOut" ],
-	"commentStamp" : "",
+		"StdOut"
+	],
 	"instvars" : [
-		"suiteName" ],
+		"suiteName"
+	],
 	"name" : "SmalltalkCIPharo",
-	"pools" : [
-		 ],
-	"super" : "SmalltalkCI",
-	"type" : "normal" }
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo10.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo10.class/methodProperties.json
deleted file mode 100644
index 6afa38a9..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo10.class/methodProperties.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"class" : {
-		"getEnv:" : "EstebanLorenzano 7/22/2021 09:54",
-		"isPlatformCompatible" : "EstebanLorenzano 7/22/2021 09:54",
-		"testRunnerClass" : "EstebanLorenzano 7/22/2021 09:55" },
-	"instance" : {
-		 } }
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo10.class/properties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo10.class/properties.json
index 444987af..623220b1 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo10.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo10.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SmalltalkCIPharo10",
-	"pools" : [
-		 ],
 	"super" : "SmalltalkCIPharo9",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SmalltalkCIPharo10",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo11.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo11.class/methodProperties.json
deleted file mode 100644
index e90f9656..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo11.class/methodProperties.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"class" : {
-		"getEnv:" : "EstebanLorenzano 7/22/2021 09:54",
-		"isPlatformCompatible" : "EstebanLorenzano 7/22/2021 09:54",
-		"newTravisID" : "EstebanLorenzano 4/13/2022 21:23",
-		"saveImage" : "noha 2/15/2024 23:22",
-		"testRunnerClass" : "EstebanLorenzano 7/22/2021 09:55" },
-	"instance" : {
-		 } }
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo11.class/properties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo11.class/properties.json
index 47767bc7..04a57e46 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo11.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo11.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SmalltalkCIPharo11",
-	"pools" : [
-		 ],
 	"super" : "SmalltalkCIPharo9",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SmalltalkCIPharo11",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/methodProperties.json
deleted file mode 100644
index cadbebb9..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/methodProperties.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"class" : {
-		"allCategoryNames" : "MaxLeske 9/30/2023 9:20",
-		"classesInCategory:" : "MaxLeske 9/23/2023 10:06",
-		"codeCoverageClass" : "MaxLeske 9/30/2023 9:20",
-		"isPlatformCompatible" : "CyrilFerlicot 4/17/2023 13:59",
-		"setAuthor:" : "MaxLeske 2/9/2024 7:25",
-		"timeToRun:" : "JohanBrichau 1/14/2024 9:46" },
-	"instance" : {
-		 } }
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/properties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/properties.json
index 73f9b4a0..de5ae094 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo12.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SmalltalkCIPharo12",
-	"pools" : [
-		 ],
 	"super" : "SmalltalkCIPharo11",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SmalltalkCIPharo12",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/setAuthor.st b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/setAuthor..st
similarity index 100%
rename from repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/setAuthor.st
rename to repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/class/setAuthor..st
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/methodProperties.json
deleted file mode 100644
index 1fe9c4b8..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/methodProperties.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"class" : {
-		"allPackageNames" : "MaxLeske 6/11/2024 20:01",
-		"codeCoverageClass" : "MaxLeske 4/29/2024 19:25",
-		"packageNamed:ifAbsent:" : "MaxLeske 6/11/2024 20:01",
-		"isPlatformCompatible" : "MaxLeske 4/29/2024 19:25"
-	},
-	"instance" : {
-		"imageInfo" : "MaxLeske 6/15/2024 07:51"
-	}
-}
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/properties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/properties.json
index 27ecd9ba..5a038994 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo13.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SmalltalkCIPharo13",
-	"pools" : [
-		 ],
 	"super" : "SmalltalkCIPharo12",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SmalltalkCIPharo13",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo34.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo34.class/methodProperties.json
deleted file mode 100644
index 83bea173..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo34.class/methodProperties.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"class" : {
-		"codeCoverageClass" : "EstebanLorenzano 5/27/2021 21:49",
-		"isPlatformCompatible" : "GOC 10/3/2019 12:14" },
-	"instance" : {
-		 } }
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo34.class/properties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo34.class/properties.json
index 0d8abfe2..86a677fd 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo34.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo34.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SmalltalkCIPharo34",
-	"pools" : [
-		 ],
 	"super" : "SmalltalkCIPharo",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SmalltalkCIPharo34",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo78.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo78.class/methodProperties.json
deleted file mode 100644
index f811795a..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo78.class/methodProperties.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"class" : {
-		"forceNewFileNamed:do:" : "maxmattone 4/14/2021 17:14:21",
-		"getEnv:" : "fn 12/22/2018 14:20",
-		"isPlatformCompatible" : "fn 4/24/2019 22:00",
-		"stdout" : "GuillermoPolito 10/4/2017 17:56",
-	    "preLoad" : "CyrilFerlicot 02/22/2023 11:23" },
-	"instance" : {
-		 } }
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo78.class/properties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo78.class/properties.json
index bd0edff8..5b98dcea 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo78.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo78.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Core",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SmalltalkCIPharo78",
-	"pools" : [
-		 ],
 	"super" : "SmalltalkCIPharo",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Core",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SmalltalkCIPharo78",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo9.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo9.class/methodProperties.json
deleted file mode 100644
index f52d2610..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/SmalltalkCIPharo9.class/methodProperties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-
-{
-	"class" : {
-		"isHeadless" : "JonathanVanAlteren 5/5/2023 16:16",
-		"isPlatformCompatible" : "BenoitVerhaeghe 12/15/2020 10:00",
-		"testRunnerClass" : "BenoitVerhaeghe 12/15/2020 10:00" },
-	"instance" : {
-		"imageInfo" : "BenoitVerhaeghe 12/15/2020 10:00" } }
diff --git a/repository/SmalltalkCI-Pharo-Core.package/TestCase.extension/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/TestCase.extension/methodProperties.json
deleted file mode 100644
index 59a5a291..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/TestCase.extension/methodProperties.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"class" : {
-		 },
-	"instance" : {
-		"allTests" : "smalltalkCI 6/19/2018 21:05" } }
diff --git a/repository/SmalltalkCI-Pharo-Core.package/TestCase.extension/properties.json b/repository/SmalltalkCI-Pharo-Core.package/TestCase.extension/properties.json
index 49aad66d..a3fb0afc 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/TestCase.extension/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/TestCase.extension/properties.json
@@ -1,2 +1,3 @@
 {
-	"name" : "TestCase" }
+	"name" : "TestCase"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/TestSuite.extension/methodProperties.json b/repository/SmalltalkCI-Pharo-Core.package/TestSuite.extension/methodProperties.json
deleted file mode 100644
index 9574778a..00000000
--- a/repository/SmalltalkCI-Pharo-Core.package/TestSuite.extension/methodProperties.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"class" : {
-		 },
-	"instance" : {
-		"allTests" : "smalltalkCI 6/19/2018 21:06" } }
diff --git a/repository/SmalltalkCI-Pharo-Core.package/TestSuite.extension/properties.json b/repository/SmalltalkCI-Pharo-Core.package/TestSuite.extension/properties.json
index 2995056f..c8d279a7 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/TestSuite.extension/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/TestSuite.extension/properties.json
@@ -1,2 +1,3 @@
 {
-	"name" : "TestSuite" }
+	"name" : "TestSuite"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Core.package/monticello.meta/categories.st b/repository/SmalltalkCI-Pharo-Core.package/monticello.meta/categories.st
index 37bb1685..5240a771 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/monticello.meta/categories.st
+++ b/repository/SmalltalkCI-Pharo-Core.package/monticello.meta/categories.st
@@ -1 +1 @@
-SystemOrganization addCategory: #'SmalltalkCI-Pharo-Core'!
+self packageOrganizer ensurePackage: #'SmalltalkCI-Pharo-Core' withTags: #()!
diff --git a/repository/SmalltalkCI-Pharo-Core.package/properties.json b/repository/SmalltalkCI-Pharo-Core.package/properties.json
index f037444a..6f31cf5a 100644
--- a/repository/SmalltalkCI-Pharo-Core.package/properties.json
+++ b/repository/SmalltalkCI-Pharo-Core.package/properties.json
@@ -1,2 +1 @@
-{
-	 }
+{ }
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/.filetree b/repository/SmalltalkCI-Pharo-Tests.package/.filetree
index 8998102c..57a67973 100644
--- a/repository/SmalltalkCI-Pharo-Tests.package/.filetree
+++ b/repository/SmalltalkCI-Pharo-Tests.package/.filetree
@@ -1,4 +1,5 @@
 {
-	"noMethodMetaData" : true,
 	"separateMethodMetaAndSource" : false,
-	"useCypressPropertiesFile" : true }
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/README.md b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/README.md
new file mode 100644
index 00000000..6ccbed04
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/README.md
@@ -0,0 +1,3 @@
+I am test resource used to test behaviour of nested test suites in Pharo
+
+See SCIPharoTestSuiteNestingTest.
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/class/reallyReset.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/class/reallyReset.st
new file mode 100644
index 00000000..3570ce12
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/class/reallyReset.st
@@ -0,0 +1,4 @@
+class initialization
+reallyReset
+	SetUpCounter := nil.
+	TearDownCounter := nil
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/class/setUpCounter.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/class/setUpCounter.st
new file mode 100644
index 00000000..41b17bbb
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/class/setUpCounter.st
@@ -0,0 +1,3 @@
+initialization
+setUpCounter
+	^ SetUpCounter
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/class/tearDownCounter.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/class/tearDownCounter.st
new file mode 100644
index 00000000..2ea52d63
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/class/tearDownCounter.st
@@ -0,0 +1,3 @@
+initialization
+tearDownCounter
+	^ TearDownCounter
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/instance/setUp.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/instance/setUp.st
new file mode 100644
index 00000000..63a5eb56
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/instance/setUp.st
@@ -0,0 +1,4 @@
+running
+setUp
+	super setUp.
+	SetUpCounter := SetUpCounter ifNil: [ 1 ] ifNotNil: [ :i | i + 1 ]
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/instance/tearDown.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/instance/tearDown.st
new file mode 100644
index 00000000..8efc3546
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/instance/tearDown.st
@@ -0,0 +1,4 @@
+running
+tearDown
+	TearDownCounter := TearDownCounter ifNil: [ 1 ] ifNotNil: [ :i | i + 1 ].
+	super tearDown
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/properties.json b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/properties.json
new file mode 100644
index 00000000..c49eca7a
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIDummyPharoTestResource.class/properties.json
@@ -0,0 +1,14 @@
+{
+	"commentStamp" : "2024-09-17 18:33",
+	"super" : "TestResource",
+	"category" : "SmalltalkCI-Pharo-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [
+		"SetUpCounter",
+		"TearDownCounter"
+	],
+	"instvars" : [ ],
+	"name" : "SCIDummyPharoTestResource",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestRunnerTest.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestRunnerTest.class/methodProperties.json
deleted file mode 100644
index 29f5f5ef..00000000
--- a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestRunnerTest.class/methodProperties.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"class" : {
-		 },
-	"instance" : {
-		"testCustomTestSuite" : "maxmattone 4/14/2021 17:11",
-		"testSkip" : "BenoitVerhaeghe 12/15/2020 10:00" } }
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestRunnerTest.class/properties.json b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestRunnerTest.class/properties.json
index 52a031fb..05b514a9 100644
--- a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestRunnerTest.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestRunnerTest.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCIPharoTestRunnerTest",
-	"pools" : [
-		 ],
 	"super" : "TestCase",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharoTestRunnerTest",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/README.md b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/README.md
new file mode 100644
index 00000000..e69de29b
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/instance/setUp.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/instance/setUp.st
new file mode 100644
index 00000000..9bea05f5
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/instance/setUp.st
@@ -0,0 +1,4 @@
+running
+setUp
+	super setUp.
+	SCIDummyPharoTestResource reallyReset
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/instance/tearDown.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/instance/tearDown.st
new file mode 100644
index 00000000..78c79094
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/instance/tearDown.st
@@ -0,0 +1,4 @@
+running
+tearDown
+	SCIDummyPharoTestResource reallyReset.
+	super tearDown
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/instance/testResourcesSetupOnce.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/instance/testResourcesSetupOnce.st
new file mode 100644
index 00000000..a514a625
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/instance/testResourcesSetupOnce.st
@@ -0,0 +1,15 @@
+tests
+testResourcesSetupOnce
+	"This test ensures that SmalltalkCI only instantiates test resources once.
+	In Pharo, some test runners nest suites and currently test resources are not
+	properly handled in that case, i.e., test resources would be instantiated
+	once per test class (usually)."
+	self assert: SCIDummyPharoTestResource setUpCounter isNil.
+	self assert: SCIDummyPharoTestResource tearDownCounter isNil.
+
+	SmalltalkCI testRunnerClass runSpec: (SCIDummySpec forClasses: { 
+		SCIPharoTestSuiteNestingTestCase1.
+		SCIPharoTestSuiteNestingTestCase2 }).
+		
+	self assert: SCIDummyPharoTestResource setUpCounter equals: 1.
+	self assert: SCIDummyPharoTestResource tearDownCounter equals: 1
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/properties.json b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/properties.json
new file mode 100644
index 00000000..9f6de62e
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTest.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "TestCase",
+	"category" : "SmalltalkCI-Pharo-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharoTestSuiteNestingTest",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/README.md b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/README.md
new file mode 100644
index 00000000..e69de29b
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/class/isAbstract.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/class/isAbstract.st
new file mode 100644
index 00000000..7244caf0
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/class/isAbstract.st
@@ -0,0 +1,5 @@
+testing
+isAbstract
+	"This test is run by another test and shouldn't be picked up by the runner"
+	^ (thisContext findContextSuchThat: [ :ctx |
+		ctx receiver class == SCIPharoTestSuiteNestingTest ]) isNil
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/class/resources.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/class/resources.st
new file mode 100644
index 00000000..e142c9b6
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/class/resources.st
@@ -0,0 +1,3 @@
+accessing
+resources
+	^ { SCIDummyPharoTestResource }
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/instance/testSomething.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/instance/testSomething.st
new file mode 100644
index 00000000..22bac086
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/instance/testSomething.st
@@ -0,0 +1,3 @@
+tests
+testSomething
+	self assert: 1 + 1 > 1
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/properties.json b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/properties.json
new file mode 100644
index 00000000..8043aab9
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase1.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "TestCase",
+	"category" : "SmalltalkCI-Pharo-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharoTestSuiteNestingTestCase1",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/README.md b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/README.md
new file mode 100644
index 00000000..e69de29b
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/class/isAbstract.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/class/isAbstract.st
new file mode 100644
index 00000000..7244caf0
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/class/isAbstract.st
@@ -0,0 +1,5 @@
+testing
+isAbstract
+	"This test is run by another test and shouldn't be picked up by the runner"
+	^ (thisContext findContextSuchThat: [ :ctx |
+		ctx receiver class == SCIPharoTestSuiteNestingTest ]) isNil
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/class/resources.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/class/resources.st
new file mode 100644
index 00000000..e142c9b6
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/class/resources.st
@@ -0,0 +1,3 @@
+accessing
+resources
+	^ { SCIDummyPharoTestResource }
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/instance/testSomething.st b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/instance/testSomething.st
new file mode 100644
index 00000000..22bac086
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/instance/testSomething.st
@@ -0,0 +1,3 @@
+tests
+testSomething
+	self assert: 1 + 1 > 1
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/properties.json b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/properties.json
new file mode 100644
index 00000000..6ccac6a9
--- /dev/null
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SCIPharoTestSuiteNestingTestCase2.class/properties.json
@@ -0,0 +1,11 @@
+{
+	"commentStamp" : "",
+	"super" : "TestCase",
+	"category" : "SmalltalkCI-Pharo-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIPharoTestSuiteNestingTestCase2",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SmalltalkCIPharoTest.class/methodProperties.json b/repository/SmalltalkCI-Pharo-Tests.package/SmalltalkCIPharoTest.class/methodProperties.json
deleted file mode 100644
index 69200609..00000000
--- a/repository/SmalltalkCI-Pharo-Tests.package/SmalltalkCIPharoTest.class/methodProperties.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"class" : {
-		 },
-	"instance" : {
-		"testPromptToProceed" : "LM 9/4/2020 15:26" } }
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/SmalltalkCIPharoTest.class/properties.json b/repository/SmalltalkCI-Pharo-Tests.package/SmalltalkCIPharoTest.class/properties.json
index 9750267a..7ffd15e7 100644
--- a/repository/SmalltalkCI-Pharo-Tests.package/SmalltalkCIPharoTest.class/properties.json
+++ b/repository/SmalltalkCI-Pharo-Tests.package/SmalltalkCIPharoTest.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Pharo-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SmalltalkCIPharoTest",
-	"pools" : [
-		 ],
 	"super" : "TestCase",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Pharo-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SmalltalkCIPharoTest",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/monticello.meta/categories.st b/repository/SmalltalkCI-Pharo-Tests.package/monticello.meta/categories.st
index cf92998f..8b817d2f 100644
--- a/repository/SmalltalkCI-Pharo-Tests.package/monticello.meta/categories.st
+++ b/repository/SmalltalkCI-Pharo-Tests.package/monticello.meta/categories.st
@@ -1 +1 @@
-SystemOrganization addCategory: #'SmalltalkCI-Pharo-Tests'!
+self packageOrganizer ensurePackage: #'SmalltalkCI-Pharo-Tests' withTags: #()!
diff --git a/repository/SmalltalkCI-Pharo-Tests.package/properties.json b/repository/SmalltalkCI-Pharo-Tests.package/properties.json
index f037444a..6f31cf5a 100644
--- a/repository/SmalltalkCI-Pharo-Tests.package/properties.json
+++ b/repository/SmalltalkCI-Pharo-Tests.package/properties.json
@@ -1,2 +1 @@
-{
-	 }
+{ }
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/.filetree b/repository/SmalltalkCI-Tests.package/.filetree
index 8998102c..57a67973 100644
--- a/repository/SmalltalkCI-Tests.package/.filetree
+++ b/repository/SmalltalkCI-Tests.package/.filetree
@@ -1,4 +1,5 @@
 {
-	"noMethodMetaData" : true,
 	"separateMethodMetaAndSource" : false,
-	"useCypressPropertiesFile" : true }
+	"noMethodMetaData" : true,
+	"useCypressPropertiesFile" : true
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SCIAbstractConfigTest.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SCIAbstractConfigTest.class/methodProperties.json
deleted file mode 100644
index c184959e..00000000
--- a/repository/SmalltalkCI-Tests.package/SCIAbstractConfigTest.class/methodProperties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"class" : {
-		 },
-	"instance" : {
-		"config" : "fn 4/14/2016 20:41",
-		"config:" : "fn 4/14/2016 20:41",
-		"setUp" : "fn 4/14/2016 20:42",
-		"testSimple" : "fn 4/14/2016 20:46" } }
diff --git a/repository/SmalltalkCI-Tests.package/SCIAbstractConfigTest.class/properties.json b/repository/SmalltalkCI-Tests.package/SCIAbstractConfigTest.class/properties.json
index ced1dbef..e7978b71 100644
--- a/repository/SmalltalkCI-Tests.package/SCIAbstractConfigTest.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SCIAbstractConfigTest.class/properties.json
@@ -1,14 +1,13 @@
 {
-	"category" : "SmalltalkCI-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
+	"super" : "TestCase",
+	"category" : "SmalltalkCI-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
 	"instvars" : [
-		"config" ],
+		"config"
+	],
 	"name" : "SCIAbstractConfigTest",
-	"pools" : [
-		 ],
-	"super" : "TestCase",
-	"type" : "normal" }
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SCIAbstractLoadSpecTest.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SCIAbstractLoadSpecTest.class/methodProperties.json
deleted file mode 100644
index 38fd8472..00000000
--- a/repository/SmalltalkCI-Tests.package/SCIAbstractLoadSpecTest.class/methodProperties.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"class" : {
-		 },
-	"instance" : {
-		"setUp" : "fniep 1/10/2016 16:22",
-		"spec" : "fniep 1/10/2016 16:21",
-		"spec:" : "fniep 1/10/2016 16:21",
-		"testIsComplete" : "fniep 1/11/2016 02:53",
-		"testIsPlatformCompatible" : "fn 6/9/2016 10:00",
-		"testSimple" : "fn 6/22/2016 10:49",
-		"testloadProjectOn" : "fn 4/14/2016 21:01" } }
diff --git a/repository/SmalltalkCI-Tests.package/SCIAbstractLoadSpecTest.class/properties.json b/repository/SmalltalkCI-Tests.package/SCIAbstractLoadSpecTest.class/properties.json
index 6070bbde..5c82bf7d 100644
--- a/repository/SmalltalkCI-Tests.package/SCIAbstractLoadSpecTest.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SCIAbstractLoadSpecTest.class/properties.json
@@ -1,14 +1,13 @@
 {
-	"category" : "SmalltalkCI-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
+	"super" : "TestCase",
+	"category" : "SmalltalkCI-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
 	"instvars" : [
-		"spec" ],
+		"spec"
+	],
 	"name" : "SCIAbstractLoadSpecTest",
-	"pools" : [
-		 ],
-	"super" : "TestCase",
-	"type" : "normal" }
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SCICustomScriptTest.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SCICustomScriptTest.class/methodProperties.json
deleted file mode 100644
index acc2d127..00000000
--- a/repository/SmalltalkCI-Tests.package/SCICustomScriptTest.class/methodProperties.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"class" : {
-		"testFileContents" : "fn 11/20/2017 13:55",
-		"testFileName" : "fn 11/1/2017 14:14" },
-	"instance" : {
-		"testFileInFrom" : "fn 11/20/2017 14:10" } }
diff --git a/repository/SmalltalkCI-Tests.package/SCICustomScriptTest.class/properties.json b/repository/SmalltalkCI-Tests.package/SCICustomScriptTest.class/properties.json
index 18fa2697..cbcba1ad 100644
--- a/repository/SmalltalkCI-Tests.package/SCICustomScriptTest.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SCICustomScriptTest.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCICustomScriptTest",
-	"pools" : [
-		 ],
 	"super" : "SCITestCaseWithFile",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCICustomScriptTest",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SCIDummySpec.class/class/forClasses..st b/repository/SmalltalkCI-Tests.package/SCIDummySpec.class/class/forClasses..st
new file mode 100644
index 00000000..1d966846
--- /dev/null
+++ b/repository/SmalltalkCI-Tests.package/SCIDummySpec.class/class/forClasses..st
@@ -0,0 +1,5 @@
+instance creation
+forClasses: aCollection
+	^ self new
+		classesToTest: aCollection;
+		yourself
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SCIDummySpec.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SCIDummySpec.class/methodProperties.json
deleted file mode 100644
index 0cc863bc..00000000
--- a/repository/SmalltalkCI-Tests.package/SCIDummySpec.class/methodProperties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"class" : {
-		"forClass:" : "fn 11/12/2017 23:36",
-		"named:forClass:" : "fn 11/12/2017 23:35" },
-	"instance" : {
-		"classesToTest" : "fn 11/11/2017 14:57",
-		"classesToTest:" : "fn 11/10/2017 13:59",
-		"failOnZeroTests" : "fn 11/21/2017 18:50" } }
diff --git a/repository/SmalltalkCI-Tests.package/SCIDummySpec.class/properties.json b/repository/SmalltalkCI-Tests.package/SCIDummySpec.class/properties.json
index 90e8286d..da71c74e 100644
--- a/repository/SmalltalkCI-Tests.package/SCIDummySpec.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SCIDummySpec.class/properties.json
@@ -1,14 +1,13 @@
 {
-	"category" : "SmalltalkCI-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
+	"super" : "SmalltalkCISpec",
+	"category" : "SmalltalkCI-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
 	"instvars" : [
-		"classesToTest" ],
+		"classesToTest"
+	],
 	"name" : "SCIDummySpec",
-	"pools" : [
-		 ],
-	"super" : "SmalltalkCISpec",
-	"type" : "normal" }
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SCIGemStoneServerConfigSpecTest.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SCIGemStoneServerConfigSpecTest.class/methodProperties.json
deleted file mode 100644
index 2b843a49..00000000
--- a/repository/SmalltalkCI-Tests.package/SCIGemStoneServerConfigSpecTest.class/methodProperties.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"class" : {
-		 },
-	"instance" : {
-		"setUp" : "fn 4/14/2016 20:48",
-		"testSimple" : "fn 10/14/2016 16:15" } }
diff --git a/repository/SmalltalkCI-Tests.package/SCIGemStoneServerConfigSpecTest.class/properties.json b/repository/SmalltalkCI-Tests.package/SCIGemStoneServerConfigSpecTest.class/properties.json
index 74082137..189ba991 100644
--- a/repository/SmalltalkCI-Tests.package/SCIGemStoneServerConfigSpecTest.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SCIGemStoneServerConfigSpecTest.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCIGemStoneServerConfigSpecTest",
-	"pools" : [
-		 ],
 	"super" : "SCIAbstractConfigTest",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIGemStoneServerConfigSpecTest",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SCIGoferLoadSpecTest.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SCIGoferLoadSpecTest.class/methodProperties.json
deleted file mode 100644
index d08c5f03..00000000
--- a/repository/SmalltalkCI-Tests.package/SCIGoferLoadSpecTest.class/methodProperties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"class" : {
-		 },
-	"instance" : {
-		"setUp" : "fn 6/9/2016 15:26",
-		"testAddLoadedClassesFrom" : "fn 6/22/2016 10:50",
-		"testIsComplete" : "fn 6/13/2016 09:50",
-		"testSimple" : "ct 5/15/2021 18:17" } }
diff --git a/repository/SmalltalkCI-Tests.package/SCIGoferLoadSpecTest.class/properties.json b/repository/SmalltalkCI-Tests.package/SCIGoferLoadSpecTest.class/properties.json
index da5a9206..87d4e3a7 100644
--- a/repository/SmalltalkCI-Tests.package/SCIGoferLoadSpecTest.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SCIGoferLoadSpecTest.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCIGoferLoadSpecTest",
-	"pools" : [
-		 ],
 	"super" : "SCIAbstractLoadSpecTest",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIGoferLoadSpecTest",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SCIMetacelloLoadSpecTest.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SCIMetacelloLoadSpecTest.class/methodProperties.json
deleted file mode 100644
index bc6b905d..00000000
--- a/repository/SmalltalkCI-Tests.package/SCIMetacelloLoadSpecTest.class/methodProperties.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-	"class" : {
-		 },
-	"instance" : {
-		"setUp" : "fniep 1/10/2016 16:10",
-		"testIsComplete" : "fn 6/9/2016 09:53",
-		"testSimple" : "ct 5/15/2021 18:17" } }
diff --git a/repository/SmalltalkCI-Tests.package/SCIMetacelloLoadSpecTest.class/properties.json b/repository/SmalltalkCI-Tests.package/SCIMetacelloLoadSpecTest.class/properties.json
index 73b3bf8c..99a85d5f 100644
--- a/repository/SmalltalkCI-Tests.package/SCIMetacelloLoadSpecTest.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SCIMetacelloLoadSpecTest.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCIMetacelloLoadSpecTest",
-	"pools" : [
-		 ],
 	"super" : "SCIAbstractLoadSpecTest",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIMetacelloLoadSpecTest",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SCIMockSmalltalkCI.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SCIMockSmalltalkCI.class/methodProperties.json
deleted file mode 100644
index ab594166..00000000
--- a/repository/SmalltalkCI-Tests.package/SCIMockSmalltalkCI.class/methodProperties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"class" : {
-		"envVars" : "ct 11/7/2020 17:58",
-		"getEnv:" : "ct 11/7/2020 17:58",
-		"installDuring:" : "ct 11/7/2020 17:56",
-		"setEnv:to:" : "ct 11/7/2020 17:57" },
-	"instance" : {
-		 } }
diff --git a/repository/SmalltalkCI-Tests.package/SCIMockSmalltalkCI.class/properties.json b/repository/SmalltalkCI-Tests.package/SCIMockSmalltalkCI.class/properties.json
index 8bb38122..a65da8bd 100644
--- a/repository/SmalltalkCI-Tests.package/SCIMockSmalltalkCI.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SCIMockSmalltalkCI.class/properties.json
@@ -1,14 +1,13 @@
 {
+	"commentStamp" : "ct 11/7/2020 18:57",
+	"super" : "SCIObjectWithSpec",
 	"category" : "SmalltalkCI-Tests",
 	"classinstvars" : [
-		"envVars" ],
-	"classvars" : [
-		 ],
-	"commentStamp" : "ct 11/7/2020 18:57",
-	"instvars" : [
-		 ],
+		"envVars"
+	],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
 	"name" : "SCIMockSmalltalkCI",
-	"pools" : [
-		 ],
-	"super" : "SCIObjectWithSpec",
-	"type" : "normal" }
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SCIMonticelloLoadSpecTest.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SCIMonticelloLoadSpecTest.class/methodProperties.json
deleted file mode 100644
index 6c1c86ec..00000000
--- a/repository/SmalltalkCI-Tests.package/SCIMonticelloLoadSpecTest.class/methodProperties.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"class" : {
-		 },
-	"instance" : {
-		"setUp" : "fn 6/9/2016 09:53",
-		"testIsComplete" : "fn 6/9/2016 10:00",
-		"testRepository" : "fn 6/9/2016 15:23",
-		"testSimple" : "ct 5/15/2021 18:17" } }
diff --git a/repository/SmalltalkCI-Tests.package/SCIMonticelloLoadSpecTest.class/properties.json b/repository/SmalltalkCI-Tests.package/SCIMonticelloLoadSpecTest.class/properties.json
index a3bde2db..92273bdf 100644
--- a/repository/SmalltalkCI-Tests.package/SCIMonticelloLoadSpecTest.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SCIMonticelloLoadSpecTest.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCIMonticelloLoadSpecTest",
-	"pools" : [
-		 ],
 	"super" : "SCIAbstractLoadSpecTest",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCIMonticelloLoadSpecTest",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SCITestCaseWithFile.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SCITestCaseWithFile.class/methodProperties.json
deleted file mode 100644
index f95e2d6b..00000000
--- a/repository/SmalltalkCI-Tests.package/SCITestCaseWithFile.class/methodProperties.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"class" : {
-		"testFileContents" : "fn 11/20/2017 13:54",
-		"testFileName" : "fn 11/20/2017 14:06" },
-	"instance" : {
-		"createTestFile" : "fn 11/22/2017 14:19",
-		"deleteTestFile" : "fn 11/22/2017 14:20",
-		"fullTestFilePath" : "fn 11/20/2017 14:13",
-		"withTestFileDo:" : "fn 11/20/2017 14:14" } }
diff --git a/repository/SmalltalkCI-Tests.package/SCITestCaseWithFile.class/properties.json b/repository/SmalltalkCI-Tests.package/SCITestCaseWithFile.class/properties.json
index 3848ac24..d06dfe17 100644
--- a/repository/SmalltalkCI-Tests.package/SCITestCaseWithFile.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SCITestCaseWithFile.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCITestCaseWithFile",
-	"pools" : [
-		 ],
 	"super" : "TestCase",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCITestCaseWithFile",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SCITestReporterXMLTest.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SCITestReporterXMLTest.class/methodProperties.json
deleted file mode 100644
index 5b181943..00000000
--- a/repository/SmalltalkCI-Tests.package/SCITestReporterXMLTest.class/methodProperties.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"class" : {
-		 },
-	"instance" : {
-		"testReportFailure" : "fn 11/12/2017 23:36",
-		"testReportSuccess" : "fn 11/12/2017 23:36" } }
diff --git a/repository/SmalltalkCI-Tests.package/SCITestReporterXMLTest.class/properties.json b/repository/SmalltalkCI-Tests.package/SCITestReporterXMLTest.class/properties.json
index 32f8195c..fa8b53f8 100644
--- a/repository/SmalltalkCI-Tests.package/SCITestReporterXMLTest.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SCITestReporterXMLTest.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCITestReporterXMLTest",
-	"pools" : [
-		 ],
 	"super" : "TestCase",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCITestReporterXMLTest",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SCITestRunnerTest.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SCITestRunnerTest.class/methodProperties.json
deleted file mode 100644
index e13f7e13..00000000
--- a/repository/SmalltalkCI-Tests.package/SCITestRunnerTest.class/methodProperties.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-	"class" : {
-		 },
-	"instance" : {
-		"testRunClasses" : "fn 11/21/2017 18:46",
-		"testRunSpecNamed" : "fn 11/21/2017 18:52" } }
diff --git a/repository/SmalltalkCI-Tests.package/SCITestRunnerTest.class/properties.json b/repository/SmalltalkCI-Tests.package/SCITestRunnerTest.class/properties.json
index a18e3482..6a6a8203 100644
--- a/repository/SmalltalkCI-Tests.package/SCITestRunnerTest.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SCITestRunnerTest.class/properties.json
@@ -1,14 +1,11 @@
 {
-	"category" : "SmalltalkCI-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
-	"instvars" : [
-		 ],
-	"name" : "SCITestRunnerTest",
-	"pools" : [
-		 ],
 	"super" : "TestCase",
-	"type" : "normal" }
+	"category" : "SmalltalkCI-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
+	"instvars" : [ ],
+	"name" : "SCITestRunnerTest",
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCISpecTest.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SmalltalkCISpecTest.class/methodProperties.json
deleted file mode 100644
index 918ee4d2..00000000
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCISpecTest.class/methodProperties.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"class" : {
-		"testFileContents" : "fn 11/20/2017 14:13",
-		"testFileName" : "fn 11/20/2017 14:07" },
-	"instance" : {
-		"setUp" : "fniep 1/11/2016 23:35",
-		"spec" : "fniep 1/10/2016 23:51",
-		"spec:" : "fniep 1/10/2016 23:51",
-		"testAddSpecs" : "fn 1/31/2016 19:51",
-		"testClassesToTest" : "fn 11/13/2016 22:30",
-		"testCompatibleCustomScripts" : "fn 11/1/2017 14:01",
-		"testFromFile" : "fn 11/20/2017 14:04",
-		"testFromStream" : "fn 11/21/2017 11:14",
-		"testSimple" : "fn 11/11/2017 14:49" } }
diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCISpecTest.class/properties.json b/repository/SmalltalkCI-Tests.package/SmalltalkCISpecTest.class/properties.json
index f562aadb..13088423 100644
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCISpecTest.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SmalltalkCISpecTest.class/properties.json
@@ -1,14 +1,13 @@
 {
-	"category" : "SmalltalkCI-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
+	"super" : "SCITestCaseWithFile",
+	"category" : "SmalltalkCI-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
 	"instvars" : [
-		"spec" ],
+		"spec"
+	],
 	"name" : "SmalltalkCISpecTest",
-	"pools" : [
-		 ],
-	"super" : "SCITestCaseWithFile",
-	"type" : "normal" }
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/methodProperties.json b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/methodProperties.json
deleted file mode 100644
index 6aef5a7a..00000000
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/methodProperties.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-	"class" : {
-		"expectedTests:" : "fn 10/16/2016 11:25" },
-	"instance" : {
-		"sci" : "fn 4/14/2016 22:02",
-		"sci:" : "fn 4/14/2016 22:02",
-		"setUp" : "fn 4/14/2016 22:02",
-		"testAppVeyorDetection" : "fn 10/16/2016 17:48",
-		"testAuthor" : "fn 11/3/2016 18:30",
-		"testClassesForCategories" : "fn 11/22/2017 17:36",
-		"testClassesForPackages" : "fn 11/22/2017 17:36",
-		"testClassesFrom" : "fn 6/24/2016 19:36",
-		"testClassesInCategory" : "fn 6/22/2016 00:13",
-		"testClassesInPackage" : "fn 6/22/2016 00:13",
-		"testClassesOfProjects" : "fn 6/24/2016 19:29",
-		"testClassesWithCategoryNames" : "fn 6/22/2016 00:17",
-		"testClassesWithPackageNames" : "fn 6/22/2016 00:18",
-		"testGitLabCIDetection" : "PeterUhnak 10/19/2017 13:04",
-		"testNew" : "fn 4/15/2016 14:44",
-		"testNewTravisID" : "fn 10/16/2016 12:16",
-		"testResolveAllWith" : "fn 6/22/2016 00:01",
-		"testResolveWith" : "fn 6/21/2016 23:53",
-		"testTravisDetection" : "fn 10/21/2016 19:19",
-		"testTravisFold" : "fn 10/11/2016 22:42" } }
diff --git a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/properties.json b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/properties.json
index a17626f7..acfb94d2 100644
--- a/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/properties.json
+++ b/repository/SmalltalkCI-Tests.package/SmalltalkCITest.class/properties.json
@@ -1,14 +1,13 @@
 {
-	"category" : "SmalltalkCI-Tests",
-	"classinstvars" : [
-		 ],
-	"classvars" : [
-		 ],
 	"commentStamp" : "",
+	"super" : "TestCase",
+	"category" : "SmalltalkCI-Tests",
+	"classinstvars" : [ ],
+	"pools" : [ ],
+	"classvars" : [ ],
 	"instvars" : [
-		"sci" ],
+		"sci"
+	],
 	"name" : "SmalltalkCITest",
-	"pools" : [
-		 ],
-	"super" : "TestCase",
-	"type" : "normal" }
+	"type" : "normal"
+}
\ No newline at end of file
diff --git a/repository/SmalltalkCI-Tests.package/monticello.meta/categories.st b/repository/SmalltalkCI-Tests.package/monticello.meta/categories.st
index f52d5934..51e98080 100644
--- a/repository/SmalltalkCI-Tests.package/monticello.meta/categories.st
+++ b/repository/SmalltalkCI-Tests.package/monticello.meta/categories.st
@@ -1 +1 @@
-SystemOrganization addCategory: #'SmalltalkCI-Tests'!
+self packageOrganizer ensurePackage: #'SmalltalkCI-Tests' withTags: #()!
diff --git a/repository/SmalltalkCI-Tests.package/properties.json b/repository/SmalltalkCI-Tests.package/properties.json
index f037444a..6f31cf5a 100644
--- a/repository/SmalltalkCI-Tests.package/properties.json
+++ b/repository/SmalltalkCI-Tests.package/properties.json
@@ -1,2 +1 @@
-{
-	 }
+{ }
\ No newline at end of file