diff --git a/src/BaselineOfStashSerialization/BaselineOfStashSerialization.class.st b/src/BaselineOfStashSerialization/BaselineOfStashSerialization.class.st
index 2d899a7..bfd263b 100644
--- a/src/BaselineOfStashSerialization/BaselineOfStashSerialization.class.st
+++ b/src/BaselineOfStashSerialization/BaselineOfStashSerialization.class.st
@@ -8,7 +8,17 @@ Class {
 BaselineOfStashSerialization >> baseline: spec [
 
 	<baseline>
-	spec for: #common do: [
-		spec package: #'Stash-Serialization'.
-	 ]
+	spec for: #common do: [ self baselineForCommon: spec ]
+
+]
+
+{ #category : #baselines }
+BaselineOfStashSerialization >> baselineForCommon: spec [
+
+	<baseline>
+	spec package: #'Stash-Serialization'.
+	spec
+		package: 'Stash-Serialization-Tests'
+		with: [ spec requires: #( 'Stash-Serialization' ) ]
+
 ]
diff --git a/src/Stash-Serialization/StashOnlySetTest.class.st b/src/Stash-Serialization-Tests/StashOnlySetTest.class.st
similarity index 97%
rename from src/Stash-Serialization/StashOnlySetTest.class.st
rename to src/Stash-Serialization-Tests/StashOnlySetTest.class.st
index 70ea3bb..3935f4e 100644
--- a/src/Stash-Serialization/StashOnlySetTest.class.st
+++ b/src/Stash-Serialization-Tests/StashOnlySetTest.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #StashOnlySetTest,
 	#superclass : #TestCase,
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
 
 { #category : #tests }
diff --git a/src/Stash-Serialization/StashSetterGetterTest.class.st b/src/Stash-Serialization-Tests/StashSetterGetterTest.class.st
similarity index 98%
rename from src/Stash-Serialization/StashSetterGetterTest.class.st
rename to src/Stash-Serialization-Tests/StashSetterGetterTest.class.st
index 16b6094..48c1514 100644
--- a/src/Stash-Serialization/StashSetterGetterTest.class.st
+++ b/src/Stash-Serialization-Tests/StashSetterGetterTest.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #StashSetterGetterTest,
 	#superclass : #TestCase,
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
 
 { #category : #tests }
diff --git a/src/Stash-Serialization/StashTest.class.st b/src/Stash-Serialization-Tests/StashTest.class.st
similarity index 99%
rename from src/Stash-Serialization/StashTest.class.st
rename to src/Stash-Serialization-Tests/StashTest.class.st
index 5874e87..8a73094 100644
--- a/src/Stash-Serialization/StashTest.class.st
+++ b/src/Stash-Serialization-Tests/StashTest.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #StashTest,
 	#superclass : #TestCase,
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
 
 { #category : #tests }
diff --git a/src/Stash-Serialization/StashTestOnlySet1.class.st b/src/Stash-Serialization-Tests/StashTestOnlySet1.class.st
similarity index 93%
rename from src/Stash-Serialization/StashTestOnlySet1.class.st
rename to src/Stash-Serialization-Tests/StashTestOnlySet1.class.st
index 1521fa4..efcc674 100644
--- a/src/Stash-Serialization/StashTestOnlySet1.class.st
+++ b/src/Stash-Serialization-Tests/StashTestOnlySet1.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'state'
 	],
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
 
 { #category : #initialization }
diff --git a/src/Stash-Serialization/StashTestOnlySet2.class.st b/src/Stash-Serialization-Tests/StashTestOnlySet2.class.st
similarity index 93%
rename from src/Stash-Serialization/StashTestOnlySet2.class.st
rename to src/Stash-Serialization-Tests/StashTestOnlySet2.class.st
index fbb0645..3c4b070 100644
--- a/src/Stash-Serialization/StashTestOnlySet2.class.st
+++ b/src/Stash-Serialization-Tests/StashTestOnlySet2.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'state'
 	],
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
 
 { #category : #initialization }
diff --git a/src/Stash-Serialization/StashTestOnlySet3.class.st b/src/Stash-Serialization-Tests/StashTestOnlySet3.class.st
similarity index 94%
rename from src/Stash-Serialization/StashTestOnlySet3.class.st
rename to src/Stash-Serialization-Tests/StashTestOnlySet3.class.st
index ff71215..67e696c 100644
--- a/src/Stash-Serialization/StashTestOnlySet3.class.st
+++ b/src/Stash-Serialization-Tests/StashTestOnlySet3.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'state'
 	],
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
 
 { #category : #initialization }
diff --git a/src/Stash-Serialization/StashTestSetterGetter1.class.st b/src/Stash-Serialization-Tests/StashTestSetterGetter1.class.st
similarity index 89%
rename from src/Stash-Serialization/StashTestSetterGetter1.class.st
rename to src/Stash-Serialization-Tests/StashTestSetterGetter1.class.st
index 1e9bef6..e24dfae 100644
--- a/src/Stash-Serialization/StashTestSetterGetter1.class.st
+++ b/src/Stash-Serialization-Tests/StashTestSetterGetter1.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'name'
 	],
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
 
 { #category : #accessing }
diff --git a/src/Stash-Serialization/StashTestSetterGetter2.class.st b/src/Stash-Serialization-Tests/StashTestSetterGetter2.class.st
similarity index 88%
rename from src/Stash-Serialization/StashTestSetterGetter2.class.st
rename to src/Stash-Serialization-Tests/StashTestSetterGetter2.class.st
index 2770660..5f45f23 100644
--- a/src/Stash-Serialization/StashTestSetterGetter2.class.st
+++ b/src/Stash-Serialization-Tests/StashTestSetterGetter2.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'name'
 	],
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
 
 { #category : #accessing }
diff --git a/src/Stash-Serialization/StashTestSetterGetter3.class.st b/src/Stash-Serialization-Tests/StashTestSetterGetter3.class.st
similarity index 89%
rename from src/Stash-Serialization/StashTestSetterGetter3.class.st
rename to src/Stash-Serialization-Tests/StashTestSetterGetter3.class.st
index 003d7c6..0751939 100644
--- a/src/Stash-Serialization/StashTestSetterGetter3.class.st
+++ b/src/Stash-Serialization-Tests/StashTestSetterGetter3.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'name'
 	],
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
 
 { #category : #accessing }
diff --git a/src/Stash-Serialization/StashTestTraits.class.st b/src/Stash-Serialization-Tests/StashTestTraits.class.st
similarity index 87%
rename from src/Stash-Serialization/StashTestTraits.class.st
rename to src/Stash-Serialization-Tests/StashTestTraits.class.st
index 990a83e..44a64bc 100644
--- a/src/Stash-Serialization/StashTestTraits.class.st
+++ b/src/Stash-Serialization-Tests/StashTestTraits.class.st
@@ -6,7 +6,7 @@ Class {
 	#instVars : [
 		'model4'
 	],
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
 
 { #category : #initialization }
diff --git a/src/Stash-Serialization/StashTestTraitsModel.class.st b/src/Stash-Serialization-Tests/StashTestTraitsModel.class.st
similarity index 84%
rename from src/Stash-Serialization/StashTestTraitsModel.class.st
rename to src/Stash-Serialization-Tests/StashTestTraitsModel.class.st
index e12a92f..a79c60a 100644
--- a/src/Stash-Serialization/StashTestTraitsModel.class.st
+++ b/src/Stash-Serialization-Tests/StashTestTraitsModel.class.st
@@ -4,7 +4,7 @@ Class {
 	#instVars : [
 		'test'
 	],
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
 
 { #category : #accessing }
diff --git a/src/Stash-Serialization/StashTestTraitsSubClass.class.st b/src/Stash-Serialization-Tests/StashTestTraitsSubClass.class.st
similarity index 62%
rename from src/Stash-Serialization/StashTestTraitsSubClass.class.st
rename to src/Stash-Serialization-Tests/StashTestTraitsSubClass.class.st
index 8dd597b..acaef26 100644
--- a/src/Stash-Serialization/StashTestTraitsSubClass.class.st
+++ b/src/Stash-Serialization-Tests/StashTestTraitsSubClass.class.st
@@ -1,5 +1,5 @@
 Class {
 	#name : #StashTestTraitsSubClass,
 	#superclass : #StashTestTraits,
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
diff --git a/src/Stash-Serialization/StashTraitsTest.class.st b/src/Stash-Serialization-Tests/StashTraitsTest.class.st
similarity index 94%
rename from src/Stash-Serialization/StashTraitsTest.class.st
rename to src/Stash-Serialization-Tests/StashTraitsTest.class.st
index 4f5e5f1..50fa80e 100644
--- a/src/Stash-Serialization/StashTraitsTest.class.st
+++ b/src/Stash-Serialization-Tests/StashTraitsTest.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : #StashTraitsTest,
 	#superclass : #TestCase,
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
 
 { #category : #tests }
diff --git a/src/Stash-Serialization/TStashTest.trait.st b/src/Stash-Serialization-Tests/TStashTest.trait.st
similarity index 89%
rename from src/Stash-Serialization/TStashTest.trait.st
rename to src/Stash-Serialization-Tests/TStashTest.trait.st
index a4d0728..78953ad 100644
--- a/src/Stash-Serialization/TStashTest.trait.st
+++ b/src/Stash-Serialization-Tests/TStashTest.trait.st
@@ -1,6 +1,6 @@
 Trait {
 	#name : #TStashTest,
-	#category : #'Stash-Serialization-test-cases'
+	#category : #'Stash-Serialization-Tests'
 }
 
 { #category : #'as yet unclassified' }
diff --git a/src/Stash-Serialization-Tests/package.st b/src/Stash-Serialization-Tests/package.st
new file mode 100644
index 0000000..b97fa82
--- /dev/null
+++ b/src/Stash-Serialization-Tests/package.st
@@ -0,0 +1 @@
+Package { #name : #'Stash-Serialization-Tests' }