diff --git a/src/Microdown-Tests/MicMicrodownSnippetFactory.class.st b/src/Microdown-Tests/MicMicrodownSnippetFactory.class.st
index eee75c7c..17898013 100644
--- a/src/Microdown-Tests/MicMicrodownSnippetFactory.class.st
+++ b/src/Microdown-Tests/MicMicrodownSnippetFactory.class.st
@@ -51,13 +51,6 @@ MicMicrodownSnippetFactory class >> buildDocument [
 							  << (factory perform: elementTypeSelector) ] ] ]
 ]
 
-{ #category : 'utilities' }
-MicMicrodownSnippetFactory class >> protocolNames [
-	"Return the list of all the protocol names included in this class."
-
-	^ self protocols collect: [ :protocol | protocol name ]
-]
-
 { #category : 'anchor' }
 MicMicrodownSnippetFactory >> anchorAreTrimedSample [
 	^ AnchorMarkup, '  test  '
diff --git a/src/Microdown/MicAnnotatedParagraphBlock.class.st b/src/Microdown/MicAnnotatedParagraphBlock.class.st
index aa0f27a6..49f4522d 100644
--- a/src/Microdown/MicAnnotatedParagraphBlock.class.st
+++ b/src/Microdown/MicAnnotatedParagraphBlock.class.st
@@ -48,7 +48,7 @@ MicAnnotatedParagraphBlock >> defaultLabel [
 	^ #note
 ]
 
-{ #category : 'testing' }
+{ #category : 'initialization' }
 MicAnnotatedParagraphBlock >> initialize [
 
 	super initialize.
diff --git a/src/Microdown/MicEnvironmentBlock.class.st b/src/Microdown/MicEnvironmentBlock.class.st
index 933db360..e30cf696 100644
--- a/src/Microdown/MicEnvironmentBlock.class.st
+++ b/src/Microdown/MicEnvironmentBlock.class.st
@@ -176,7 +176,7 @@ MicEnvironmentBlock >> extractFirstLineFrom: aLine [
 		ifFalse: [ firstLine ]
 ]
 
-{ #category : 'parse support' }
+{ #category : 'initialization' }
 MicEnvironmentBlock >> initialize [
 
 	super initialize.
diff --git a/src/Microdown/MicFigureBlock.class.st b/src/Microdown/MicFigureBlock.class.st
index 62205251..92b7ea4b 100644
--- a/src/Microdown/MicFigureBlock.class.st
+++ b/src/Microdown/MicFigureBlock.class.st
@@ -30,18 +30,6 @@ MicFigureBlock class >> openingDelimiter [
     ^ FigureNameOpenerMarkup
 ]
 
-{ #category : 'testing' }
-MicFigureBlock >> hasAnchor [
-
-	^ self anchor isNotNil
-]
-
-{ #category : 'testing' }
-MicFigureBlock >> hasCaption [
-	
-	^ captionElements isNotNil 
-]
-
 { #category : 'visiting' }
 MicFigureBlock >> accept: aVisitor [
  	^ aVisitor visitFigure: self
diff --git a/src/Microdown/MicInlineDelimiter.class.st b/src/Microdown/MicInlineDelimiter.class.st
index db4103ad..ed09d894 100644
--- a/src/Microdown/MicInlineDelimiter.class.st
+++ b/src/Microdown/MicInlineDelimiter.class.st
@@ -43,7 +43,7 @@ MicInlineDelimiter class >> at: markup [
 	^ DelimiterDictionary at: markup ifAbsent: [ nil ]
 ]
 
-{ #category : 'initialization' }
+{ #category : 'class initialization' }
 MicInlineDelimiter class >> initialize [
 
 	<script>
@@ -51,7 +51,7 @@ MicInlineDelimiter class >> initialize [
 	Regex := nil
 ]
 
-{ #category : 'initialization' }
+{ #category : 'class initialization' }
 MicInlineDelimiter class >> initializeDelimiters [
 
 	self = MicInlineDelimiter ifFalse: [ ^ self ].
@@ -59,7 +59,7 @@ MicInlineDelimiter class >> initializeDelimiters [
 	self allSubclasses do: [ :class | class initializeDelimiters ]
 ]
 
-{ #category : 'initialization' }
+{ #category : 'class initialization' }
 MicInlineDelimiter class >> initializeRegex [
 
 	Regex := ((self all collect: [ :each | each markupAsRegex]) joinUsing: '|') asRegex
diff --git a/src/Microdown/MicInlineElement.class.st b/src/Microdown/MicInlineElement.class.st
index dd7020e6..a311a10d 100644
--- a/src/Microdown/MicInlineElement.class.st
+++ b/src/Microdown/MicInlineElement.class.st
@@ -52,12 +52,6 @@ MicInlineElement >> closingDelimiter [
 	^ self class closingDelimiter
 ]
 
-{ #category : 'private' }
-MicInlineElement >> inlineParserClass [
-
-	^ MicInlineParser
-]
-
 { #category : 'accessing' }
 MicInlineElement >> kind [
 	"Should only be used for tests"
diff --git a/src/Microdown-Tests/MicPropertyError.class.st b/src/Microdown/MicPropertyError.class.st
similarity index 53%
rename from src/Microdown-Tests/MicPropertyError.class.st
rename to src/Microdown/MicPropertyError.class.st
index 27d3b353..3710f1a7 100644
--- a/src/Microdown-Tests/MicPropertyError.class.st
+++ b/src/Microdown/MicPropertyError.class.st
@@ -1,7 +1,7 @@
 Class {
 	#name : 'MicPropertyError',
 	#superclass : 'Error',
-	#category : 'Microdown-Tests-Parser',
-	#package : 'Microdown-Tests',
+	#category : 'Microdown-Parser',
+	#package : 'Microdown',
 	#tag : 'Parser'
 }
diff --git a/src/Microdown/MicTextBlock.class.st b/src/Microdown/MicTextBlock.class.st
index ee3e6083..4276d132 100644
--- a/src/Microdown/MicTextBlock.class.st
+++ b/src/Microdown/MicTextBlock.class.st
@@ -14,20 +14,6 @@ MicTextBlock >> accept: aVisitor [
 	^ aVisitor visitText: self
 ]
 
-{ #category : 'obsolete' }
-MicTextBlock >> bodystring [
-	"Should only be used for tests"
-	self deprecated: 'Just use bodyString' transformWith: '`@rec bodystring' -> '`@rec bodyString'.
-	^ bodyString 
-]
-
-{ #category : 'obsolete' }
-MicTextBlock >> substring [
-	"Should only be used for tests"
-	self deprecated: 'Just use bodystring' transformWith: '`@rec substring' -> '`@rec bodystring'.
-	^ bodyString 
-]
-
 { #category : 'obsolete' }
 MicTextBlock >> substring: aBody [
 	"Should only be used for tests"