diff --git a/src/BaselineOfPillarCore/BaselineOfPillarCore.class.st b/src/BaselineOfPillarCore/BaselineOfPillarCore.class.st
index d7ae0953..5b498545 100644
--- a/src/BaselineOfPillarCore/BaselineOfPillarCore.class.st
+++ b/src/BaselineOfPillarCore/BaselineOfPillarCore.class.st
@@ -12,19 +12,18 @@ BaselineOfPillarCore >> baseline: spec [
 		for: #common
 		do: [ spec blessing: #baseline.
 			spec 
-				baseline: 'ContainersPropertyEnvironment' with: [ spec 
-					repository: 'github://Ducasse/Containers-PropertyEnvironment' ];
-				baseline: 'PetitParser2Core' with: [ spec
-					 repository: 'github://kursjan/petitparser2' ];
 				package: 'Pillar-Core';
-				package: 'Pillar-Model';
-				package: 'Pillar-PetitPillar' with: [ spec 
-					requires: #( 'PetitParser2Core' 'Pillar-Model' ) ];
-				"package: 'Pillar-Tests-Model' with: [ spec 
-					requires: #('Pillar-Model' 'Pillar-ExporterPilar' 'Pillar-ExporterText') ];"
-				package: 'Pillar-Tests-PetitPillar' with: [ spec 
-					requires: #( 'Pillar-PetitPillar' )  ]
-					
+				package: 'Pillar-Model' with: [ spec 
+					requires: #( 'Pillar-Core' ) ];
+				package: 'Pillar-Tests-Core' with: [ spec 
+					requires: #( 'Pillar-Core' ) ];
+				package: 'Pillar-Tests-Model' with: [ spec 
+					requires: #( 'Pillar-Tests-Core' 'Pillar-Model') ].
+		spec
+			group: 'default' with: #('model' 'tests')	;
+			group: 'core' with: #('Pillar-Core');
+			group: 'model' with: #('Pillar-Model');
+			group: 'tests' with: #('Pillar-Tests-Core' 'Pillar-Tests-Model')					
 	]
 
 ]
diff --git a/src/Pillar-ExporterRichText/PRRichTextWriterTest.class.st b/src/Pillar-ExporterRichText/PRRichTextWriterTest.class.st
index 0e92713b..5e77a8b2 100644
--- a/src/Pillar-ExporterRichText/PRRichTextWriterTest.class.st
+++ b/src/Pillar-ExporterRichText/PRRichTextWriterTest.class.st
@@ -121,6 +121,7 @@ PRRichTextWriterTest >> testBoldFormat [
 { #category : #'tests - CodeBlock' }
 PRRichTextWriterTest >> testCodeBlock [
 	| runs richText |
+	self skip.
 	richText := self richTextFor: sample codeblock.
 
 "