diff --git a/src/GitLabHealth-Model-Analysis-Tests/ClosedMergeRequestMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/ClosedMergeRequestMetricTest.class.st
index 7442a8a..7764dbd 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/ClosedMergeRequestMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/ClosedMergeRequestMetricTest.class.st
@@ -2,12 +2,13 @@
 A ClosedMergeRequestMetricTest is a test class for testing the behavior of ClosedMergeRequestMetric
 "
 Class {
-	#name : #ClosedMergeRequestMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'ClosedMergeRequestMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 ClosedMergeRequestMetricTest >> testCalculate [
 
 	| result glhImporter user closedMergeRequestMetric |
@@ -45,7 +46,7 @@ ClosedMergeRequestMetricTest >> testCalculate [
 	self assert: result equals: 2
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ClosedMergeRequestMetricTest >> testCalculate1MRinPeriod2Outside [
 
 	| result glhImporter user closedMergeRequestMetric |
@@ -88,7 +89,7 @@ ClosedMergeRequestMetricTest >> testCalculate1MRinPeriod2Outside [
 	self assert: result equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ClosedMergeRequestMetricTest >> testCalculate3MR [
 
 	| result glhImporter user closedMergeRequestMetric |
@@ -131,7 +132,7 @@ ClosedMergeRequestMetricTest >> testCalculate3MR [
 	self assert: result equals: 3
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ClosedMergeRequestMetricTest >> testCalculate3MRClosed2Opened [
 
 	| result glhImporter user closedMergeRequestMetric |
@@ -184,7 +185,7 @@ ClosedMergeRequestMetricTest >> testCalculate3MRClosed2Opened [
 	self assert: result equals: 3
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ClosedMergeRequestMetricTest >> testCalculateNoClosedMR [
 
 	| result glhImporter user closedMergeRequestMetric |
@@ -237,7 +238,7 @@ ClosedMergeRequestMetricTest >> testCalculateNoClosedMR [
 	self assert: result equals: 0
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ClosedMergeRequestMetricTest >> testCalculateNoMergeRequests [
 
 	| result glhImporter user closedMergeRequestMetric |
@@ -263,7 +264,7 @@ ClosedMergeRequestMetricTest >> testCalculateNoMergeRequests [
 	self assert: result equals: 0
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ClosedMergeRequestMetricTest >> testCalculateOutSidePeriod [
 
 	| result glhImporter user closedMergeRequestMetric |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/ClosedTicketsMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/ClosedTicketsMetricTest.class.st
index 9d81b52..fd2e5d4 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/ClosedTicketsMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/ClosedTicketsMetricTest.class.st
@@ -2,12 +2,13 @@
 A ClosedTicketsMetricTest is a test class for testing the behavior of ClosedTicketsMetric
 "
 Class {
-	#name : #ClosedTicketsMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'ClosedTicketsMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 ClosedTicketsMetricTest >> testCalculate [
 
 	| result glhImporter user closedTicket jiraImporter |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/CodeAdditionByMRMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/CodeAdditionByMRMetricTest.class.st
index 271a190..fb3851e 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/CodeAdditionByMRMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/CodeAdditionByMRMetricTest.class.st
@@ -2,12 +2,13 @@
 A CodeAdditionByMRMetricTest is a test class for testing the behavior of CodeAdditionByMRMetric
 "
 Class {
-	#name : #CodeAdditionByMRMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'CodeAdditionByMRMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeAdditionByMRMetricTest >> testCalculate [
 
 	| result glhImporter user codeAddition |
@@ -18,7 +19,7 @@ CodeAdditionByMRMetricTest >> testCalculate [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
@@ -52,7 +53,7 @@ CodeAdditionByMRMetricTest >> testCalculate [
 	self assert: result equals: 10
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeAdditionByMRMetricTest >> testCalculateNoCommits [
 
 	| result glhImporter user codeAddition |
@@ -63,7 +64,7 @@ CodeAdditionByMRMetricTest >> testCalculateNoCommits [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
@@ -82,7 +83,7 @@ CodeAdditionByMRMetricTest >> testCalculateNoCommits [
 	self assert: result equals: 0
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeAdditionByMRMetricTest >> testCalculateNoMergeRequests [
 
 	| result glhImporter user codeAddition |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/CodeAdditionByTicketMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/CodeAdditionByTicketMetricTest.class.st
index 159ea3c..4263535 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/CodeAdditionByTicketMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/CodeAdditionByTicketMetricTest.class.st
@@ -2,12 +2,13 @@
 A CodeAdditionByTicketMetricTest is a test class for testing the behavior of CodeAdditionByTicketMetric
 "
 Class {
-	#name : #CodeAdditionByTicketMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'CodeAdditionByTicketMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeAdditionByTicketMetricTest >> testCalculate [
 
 	| result glhImporter user jiraImporter codeAddition |
@@ -18,7 +19,7 @@ CodeAdditionByTicketMetricTest >> testCalculate [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
@@ -56,7 +57,7 @@ CodeAdditionByTicketMetricTest >> testCalculate [
 	self assert: result equals: 10
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeAdditionByTicketMetricTest >> testCalculateNoCommits [
 
 	| result glhImporter user jiraImporter codeAddition |
@@ -67,7 +68,7 @@ CodeAdditionByTicketMetricTest >> testCalculateNoCommits [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
@@ -94,7 +95,7 @@ CodeAdditionByTicketMetricTest >> testCalculateNoCommits [
 	self assert: result equals: 0
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeAdditionByTicketMetricTest >> testCalculateNoMergeRequests [
 
 	| result glhImporter user jiraImporter codeAddition |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/CodeAdditionMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/CodeAdditionMetricTest.class.st
index bcc81e7..de98ff3 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/CodeAdditionMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/CodeAdditionMetricTest.class.st
@@ -2,12 +2,13 @@
 A CodeAdditionMetricTest is a test class for testing the behavior of CodeAdditionMetric
 "
 Class {
-	#name : #CodeAdditionMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'CodeAdditionMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeAdditionMetricTest >> testCalculate [
 
 	| user glhImporter codeAddition result |
@@ -44,7 +45,7 @@ CodeAdditionMetricTest >> testCalculate [
 	self assert: result equals: 10
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeAdditionMetricTest >> testCalculateNoCommits [
 
 	| user glhImporter codeAddition result |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/CodeDeletionByMRMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/CodeDeletionByMRMetricTest.class.st
index 76cb0a2..db11c66 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/CodeDeletionByMRMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/CodeDeletionByMRMetricTest.class.st
@@ -2,12 +2,13 @@
 A CodeDeletionByMRMetricTest is a test class for testing the behavior of CodeDeletionByMRMetric
 "
 Class {
-	#name : #CodeDeletionByMRMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'CodeDeletionByMRMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeDeletionByMRMetricTest >> testCalculate [
 
 	| result glhImporter user codeDeletion |
@@ -18,7 +19,7 @@ CodeDeletionByMRMetricTest >> testCalculate [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
@@ -51,7 +52,7 @@ CodeDeletionByMRMetricTest >> testCalculate [
 	self assert: result equals: 10
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeDeletionByMRMetricTest >> testCalculateNoCommits [
 
 	| result glhImporter user codeDeletion |
@@ -62,7 +63,7 @@ CodeDeletionByMRMetricTest >> testCalculateNoCommits [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
@@ -81,7 +82,7 @@ CodeDeletionByMRMetricTest >> testCalculateNoCommits [
 	self assert: result equals: 0
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeDeletionByMRMetricTest >> testCalculateNoMergeRequests [
 
 	| result glhImporter user codeDeletion |
@@ -92,7 +93,7 @@ CodeDeletionByMRMetricTest >> testCalculateNoMergeRequests [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
diff --git a/src/GitLabHealth-Model-Analysis-Tests/CodeDeletionByTicketMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/CodeDeletionByTicketMetricTest.class.st
index dfa02e3..eea82fc 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/CodeDeletionByTicketMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/CodeDeletionByTicketMetricTest.class.st
@@ -2,12 +2,13 @@
 A CodeDeletionByTicketMetricTest is a test class for testing the behavior of CodeDeletionByTicketMetric
 "
 Class {
-	#name : #CodeDeletionByTicketMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'CodeDeletionByTicketMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeDeletionByTicketMetricTest >> testCalculate [
 
 	| result glhImporter user jiraImporter codeAddition |
@@ -18,7 +19,7 @@ CodeDeletionByTicketMetricTest >> testCalculate [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
@@ -58,7 +59,7 @@ CodeDeletionByTicketMetricTest >> testCalculate [
 	self assert: result equals: 10
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeDeletionByTicketMetricTest >> testCalculateNoCommits [ 
 
 	| result glhImporter user jiraImporter codeAddition |
@@ -69,7 +70,7 @@ CodeDeletionByTicketMetricTest >> testCalculateNoCommits [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
@@ -95,7 +96,7 @@ CodeDeletionByTicketMetricTest >> testCalculateNoCommits [
 	self assert: result equals: 0
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeDeletionByTicketMetricTest >> testCalculateNoMergeRequests [
 
 	| result glhImporter user jiraImporter codeAddition |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/CodeDeletionMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/CodeDeletionMetricTest.class.st
index 5ce44b8..12e8fab 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/CodeDeletionMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/CodeDeletionMetricTest.class.st
@@ -2,12 +2,13 @@
 A CodeDeletionMetricTest is a test class for testing the behavior of CodeDeletionMetric
 "
 Class {
-	#name : #CodeDeletionMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'CodeDeletionMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeDeletionMetricTest >> testCalculate [
 
 	| user glhImporter result codeDeletion |
@@ -44,7 +45,7 @@ CodeDeletionMetricTest >> testCalculate [
 	self assert: result equals: 10
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CodeDeletionMetricTest >> testCalculateNoCommits [
 
 	| user glhImporter result codeDeletion |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/CommentContributionMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/CommentContributionMetricTest.class.st
index ba88554..743b24d 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/CommentContributionMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/CommentContributionMetricTest.class.st
@@ -2,12 +2,13 @@
 A CommentContributionMetricTest is a test class for testing the behavior of CommentContributionMetric
 "
 Class {
-	#name : #CommentContributionMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'CommentContributionMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 CommentContributionMetricTest >> testCalculate [
 
 	| user glhImporter result commitDiff commentContribution |
@@ -17,8 +18,8 @@ CommentContributionMetricTest >> testCalculate [
 		        contributedProjects:
 			        { (GLHProject new repository: GLHRepository new) }.
 
-	commitDiff := GLHDiff new diffRanges: { (GLPHEDiffRange new changes:
-			               { (GLPHEAddition new sourceCode: '// test') }) }.
+	commitDiff := GLHDiff new diffRanges: { (GLHDiffRange new changes:
+			               { (GLHAddition new sourceCode: '// test') }) }.
 
 	glhImporter := GLPHImporterMock new.
 	glhImporter commits: { (GLHCommit new
@@ -41,7 +42,7 @@ CommentContributionMetricTest >> testCalculate [
 	self assert: result equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CommentContributionMetricTest >> testCalculateNoCommits [
 
 	| user glhImporter result commentContribution |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/CommitFrequencyMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/CommitFrequencyMetricTest.class.st
index 7fa1f1c..4be1eff 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/CommitFrequencyMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/CommitFrequencyMetricTest.class.st
@@ -2,12 +2,13 @@
 A CommitFrequencyMetricTest is a test class for testing the behavior of CommitFrequencyMetric
 "
 Class {
-	#name : #CommitFrequencyMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'CommitFrequencyMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 CommitFrequencyMetricTest >> testCalculate [
 
 	| user glhImporter result commitFrequency |
@@ -33,7 +34,7 @@ CommitFrequencyMetricTest >> testCalculate [
 	self assert: result equals: 0
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CommitFrequencyMetricTest >> testCalculateNoCommits [
 
 	| user glhImporter result commitFrequency |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/CommitsNumberByJiraTicketsMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/CommitsNumberByJiraTicketsMetricTest.class.st
index 2bbd598..50eb2eb 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/CommitsNumberByJiraTicketsMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/CommitsNumberByJiraTicketsMetricTest.class.st
@@ -2,12 +2,13 @@
 A CommitsNumberByJiraTicketsMetricTest is a test class for testing the behavior of CommitsNumberByJiraTicketsMetric
 "
 Class {
-	#name : #CommitsNumberByJiraTicketsMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'CommitsNumberByJiraTicketsMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 CommitsNumberByJiraTicketsMetricTest >> testCalculate [
 
 	| result glhImporter user jiraImporter commitsNumber |
@@ -18,7 +19,7 @@ CommitsNumberByJiraTicketsMetricTest >> testCalculate [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
@@ -50,7 +51,7 @@ CommitsNumberByJiraTicketsMetricTest >> testCalculate [
 	self assert: result equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CommitsNumberByJiraTicketsMetricTest >> testCalculateNoCommits [
 
 	| result glhImporter user jiraImporter commitsNumber |
@@ -61,7 +62,7 @@ CommitsNumberByJiraTicketsMetricTest >> testCalculateNoCommits [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
@@ -87,7 +88,7 @@ CommitsNumberByJiraTicketsMetricTest >> testCalculateNoCommits [
 	self assert: result equals: 0
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 CommitsNumberByJiraTicketsMetricTest >> testCalculateNoMergeRequests [
 
 	| result glhImporter user jiraImporter commitsNumber |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/ContributedProjectMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/ContributedProjectMetricTest.class.st
index 59a2e0c..8288f46 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/ContributedProjectMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/ContributedProjectMetricTest.class.st
@@ -2,12 +2,13 @@
 A ContributedProjectMetricTest is a test class for testing the behavior of ContributedProjectMetric
 "
 Class {
-	#name : #ContributedProjectMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'ContributedProjectMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 ContributedProjectMetricTest >> testCalculate [
 
 	| user glhImporter result contributedProject project1 repository1 |
@@ -48,7 +49,7 @@ ContributedProjectMetricTest >> testCalculate [
 	self assert: result equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ContributedProjectMetricTest >> testCalculateNoCommits [
 
 	| user glhImporter result contributedProject project1 repository1 |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/GLHUserCatalogueTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/GLHUserCatalogueTest.class.st
index 84ccd0c..d09d01a 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/GLHUserCatalogueTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/GLHUserCatalogueTest.class.st
@@ -2,21 +2,22 @@
 A GLHUserCatalogueTest is a test class for testing the behavior of GLHUserCatalogue
 "
 Class {
-	#name : #GLHUserCatalogueTest,
-	#superclass : #TestCase,
+	#name : 'GLHUserCatalogueTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'catalogue'
 	],
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 GLHUserCatalogueTest >> setUp [
 
 	catalogue := GLHUserCatalogue new. 
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueTest >> testAddSameUser [
 
 	| user |
@@ -32,7 +33,7 @@ GLHUserCatalogueTest >> testAddSameUser [
 	self assert: catalogue size equals: 1
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueTest >> testAddUser [
 
 	| user  |
@@ -48,7 +49,7 @@ GLHUserCatalogueTest >> testAddUser [
 	self assert: catalogue size equals: 1
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueTest >> testAddUserWithName [
 
 	| user |
@@ -69,7 +70,7 @@ GLHUserCatalogueTest >> testAddUserWithName [
 		equals: true
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueTest >> testAddUserWithNames [
 
 	| user |
@@ -88,7 +89,7 @@ GLHUserCatalogueTest >> testAddUserWithNames [
 	self assert: ((catalogue at: user) includes: 'titi') equals: true
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueTest >> testAddUsers [
 
 	| user1 user2  |
@@ -110,7 +111,7 @@ GLHUserCatalogueTest >> testAddUsers [
 	self assert: catalogue size equals: 2
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueTest >> testCollectUsernames [
 
 	| user1 user2  res |
@@ -139,7 +140,7 @@ GLHUserCatalogueTest >> testCollectUsernames [
 	self assert: (res at: 'test user2') equals: user2
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 GLHUserCatalogueTest >> testExportAndLoad [
 
 	| user json  res |
@@ -156,7 +157,7 @@ GLHUserCatalogueTest >> testExportAndLoad [
 	self assert: res size equals: catalogue size
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueTest >> testExportToJson [
 
 	| user user2 json  res |
@@ -183,7 +184,7 @@ GLHUserCatalogueTest >> testExportToJson [
 	self assert: ((res at: 'test user') at: #foundNames) size equals: 2
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 GLHUserCatalogueTest >> testLoadFromJson [
 
 	| json res |
@@ -195,7 +196,7 @@ GLHUserCatalogueTest >> testLoadFromJson [
 		self assert: (res searchUserWithName: 'VERHAEGHE') isNotEmpty equals: true.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueTest >> testNamesAt [
 
 	| user  |
@@ -221,7 +222,7 @@ GLHUserCatalogueTest >> testNamesAt [
 		equals: true
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueTest >> testNamesAtChangingUser [
 
 	| user  |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/GLHUserCatalogueV2Test.class.st b/src/GitLabHealth-Model-Analysis-Tests/GLHUserCatalogueV2Test.class.st
index 39de711..8801435 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/GLHUserCatalogueV2Test.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/GLHUserCatalogueV2Test.class.st
@@ -1,19 +1,20 @@
 Class {
-	#name : #GLHUserCatalogueV2Test,
-	#superclass : #TestCase,
+	#name : 'GLHUserCatalogueV2Test',
+	#superclass : 'TestCase',
 	#instVars : [
 		'catalogue'
 	],
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 GLHUserCatalogueV2Test >> setUp [
 
 	catalogue := GLHUserCatalogueV2 new
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueV2Test >> testAddSameUser [
 
 	| user |
@@ -29,7 +30,7 @@ GLHUserCatalogueV2Test >> testAddSameUser [
 	self assert: catalogue size equals: 1
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueV2Test >> testAddUser [
 
 	| user  |
@@ -45,7 +46,7 @@ GLHUserCatalogueV2Test >> testAddUser [
 	self assert: catalogue size equals: 1
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueV2Test >> testAddUserWithName [
 
 	| user |
@@ -66,7 +67,7 @@ GLHUserCatalogueV2Test >> testAddUserWithName [
 		equals: true
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueV2Test >> testAddUserWithNames [
 
 	| user |
@@ -89,7 +90,7 @@ GLHUserCatalogueV2Test >> testAddUserWithNames [
 		equals: true
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueV2Test >> testAddUsers [
 
 	| user1 user2  |
@@ -111,7 +112,7 @@ GLHUserCatalogueV2Test >> testAddUsers [
 	self assert: catalogue size equals: 2
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueV2Test >> testCollectUsernames [
 
 	| user1 user2  res |
@@ -140,7 +141,7 @@ GLHUserCatalogueV2Test >> testCollectUsernames [
 	self assert: (res at: 'test user2') equals: user2
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 GLHUserCatalogueV2Test >> testExportAndLoad [
 
 	| user json  res |
@@ -160,7 +161,7 @@ GLHUserCatalogueV2Test >> testExportAndLoad [
 	self assert: ((res at: 'test user' at: #names) includes: 'testUser') equals: true.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueV2Test >> testExportToJson [
 
 	| user user2 json  res |
@@ -191,7 +192,7 @@ GLHUserCatalogueV2Test >> testExportToJson [
 	self assert: ((res at: 'test user2') at: #contributedProjects) size equals: 2.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueV2Test >> testExportToJsonApostrophe [
 
 	| user  json  res |
@@ -216,31 +217,31 @@ GLHUserCatalogueV2Test >> testExportToJsonApostrophe [
 
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GLHUserCatalogueV2Test >> testLevenshteinDistanceBetweenBenoitAndNicolas [
 	self assert: ('benoit' levenshteinDistanceWith: 'nicolas') equals: 6
 	
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GLHUserCatalogueV2Test >> testLevenshteinDistanceBetweenExamenAndExaman [
 	self assert: ('examen' levenshteinDistanceWith: 'examan') equals: 1
 	
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GLHUserCatalogueV2Test >> testLevenshteinDistanceBetweenExamenAndExamen [
 	self assert: ('examen' levenshteinDistanceWith: 'examen') equals: 0
 	
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GLHUserCatalogueV2Test >> testLevenshteinDistanceBetweenNicolasAndNico [
 	self assert: ('nicolas' levenshteinDistanceWith: 'nico') equals: 3
 	
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 GLHUserCatalogueV2Test >> testLoadFromJson [
 
 	| json res |
@@ -257,7 +258,7 @@ GLHUserCatalogueV2Test >> testLoadFromJson [
 		equals: 'Benoit VERHAEGHE'.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueV2Test >> testNamesAt [
 
 	| user  |
@@ -283,7 +284,7 @@ GLHUserCatalogueV2Test >> testNamesAt [
 		equals: true
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHUserCatalogueV2Test >> testNamesAtChangingUser [
 
 	| user  |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/GLPHImporterMock.class.st b/src/GitLabHealth-Model-Analysis-Tests/GLPHImporterMock.class.st
index 0a63a93..58bd9ab 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/GLPHImporterMock.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/GLPHImporterMock.class.st
@@ -1,108 +1,109 @@
 Class {
-	#name : #GLPHImporterMock,
-	#superclass : #Object,
+	#name : 'GLPHImporterMock',
+	#superclass : 'Object',
 	#instVars : [
 		'commits',
 		'commitDiffs',
 		'mergeRequests',
 		'glhModel'
 	],
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #commit }
+{ #category : 'commit' }
 GLPHImporterMock >> chainsCommitsFrom: fromCommits [
 	^self
 	 
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GLPHImporterMock >> commits [
 
 	^ commits
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GLPHImporterMock >> commits: anObject [
 
 	commits := anObject
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GLPHImporterMock >> completeImportedCommit: commit [
 	^self
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GLPHImporterMock >> glhModel [
 
 	^ glhModel
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GLPHImporterMock >> glhModel: anObject [
 
 	glhModel := anObject
 ]
 
-{ #category : #commit }
+{ #category : 'commit' }
 GLPHImporterMock >> importCommitsOfProject: project since: since until: until [
 
 	glhModel addAll: commits.
 	^ commits
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : 'as yet unclassified' }
 GLPHImporterMock >> importCreatorOfCommit: commit [
 
 	^self
 ]
 
-{ #category : #'import - merge request' }
+{ #category : 'import - merge request' }
 GLPHImporterMock >> importMergeRequestCommits: mergeRequest [
 
 	mergeRequest commits: self commits
 ]
 
-{ #category : #'import - merge request' }
+{ #category : 'import - merge request' }
 GLPHImporterMock >> importMergeRequests: project since: since until: until [
 
 	glhModel addAll: mergeRequests.
 	^ mergeRequests
 ]
 
-{ #category : #'import - merge request' }
+{ #category : 'import - merge request' }
 GLPHImporterMock >> importMergeResquestAuthor: mr [
 	^self
 ]
 
-{ #category : #'import - merge request' }
+{ #category : 'import - merge request' }
 GLPHImporterMock >> importMergeResquestMerger: mergeRequest [
 	^self
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 GLPHImporterMock >> initialize [
 
 	commits := OrderedCollection new.
 	mergeRequests := OrderedCollection new.
-	
-glhModel := GLPHEModel new name: 'model'
+
+	glhModel := GLHModel new name: 'model'
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GLPHImporterMock >> mergeRequests [
 
 	^ mergeRequests
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GLPHImporterMock >> mergeRequests: anObject [
 
 	mergeRequests := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GLPHImporterMock >> withCommitDiffs: aCommitDiffs [
 	commitDiffs := aCommitDiffs 
 ]
diff --git a/src/GitLabHealth-Model-Analysis-Tests/GitAnalyzerLocalTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/GitAnalyzerLocalTest.class.st
index 0fa47c4..6983aaf 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/GitAnalyzerLocalTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/GitAnalyzerLocalTest.class.st
@@ -1,6 +1,6 @@
 Class {
-	#name : #GitAnalyzerLocalTest,
-	#superclass : #TestCase,
+	#name : 'GitAnalyzerLocalTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'glphModel',
 		'glphApi',
@@ -9,15 +9,16 @@ Class {
 		'gitAnalyzer',
 		'fromCommit'
 	],
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 GitAnalyzerLocalTest >> setUp [
 
 	super setUp.
 
-	glphModel := GLPHEModel new.
+	glphModel := GLHModel new.
 	gitAnalyzer := GitAnalyzer new onModel: glphModel.
 	fromCommit := GLHCommit new.
 	fromCommit short_id: 'testFromCommit'.
@@ -27,7 +28,7 @@ GitAnalyzerLocalTest >> setUp [
 	gitAnalyzer fromCommit: fromCommit.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GitAnalyzerLocalTest >> testAnalyseCommentContributionsJavaComment [
 
 	| diffA diffARange addition |
@@ -46,7 +47,7 @@ GitAnalyzerLocalTest >> testAnalyseCommentContributionsJavaComment [
 	self assert: gitAnalyzer analyseCommentContribution equals: 1
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GitAnalyzerLocalTest >> testAnalyseCommentContributionsJavaContinueComment [
 
 	| diffA diffARange addition |
@@ -65,7 +66,7 @@ GitAnalyzerLocalTest >> testAnalyseCommentContributionsJavaContinueComment [
 	self assert: gitAnalyzer analyseCommentContribution equals: 1
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GitAnalyzerLocalTest >> testAnalyseCommentContributionsJavaStopComment [
 
 	| diffA diffARange addition |
@@ -84,7 +85,7 @@ GitAnalyzerLocalTest >> testAnalyseCommentContributionsJavaStopComment [
 	self assert: gitAnalyzer analyseCommentContribution equals: 1
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GitAnalyzerLocalTest >> testAnalyseCommentContributionsMixedMultipleComments [
 
 	| diffA diffARange addition additionB additionC |
@@ -111,7 +112,7 @@ GitAnalyzerLocalTest >> testAnalyseCommentContributionsMixedMultipleComments [
 	self assert: gitAnalyzer analyseCommentContribution equals: 2
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GitAnalyzerLocalTest >> testAnalyseCommentContributionsMultipleComments [
 
 	| diffA diffARange addition additionB additionC |
@@ -138,7 +139,7 @@ GitAnalyzerLocalTest >> testAnalyseCommentContributionsMultipleComments [
 	self assert: gitAnalyzer analyseCommentContribution equals: 3
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GitAnalyzerLocalTest >> testAnalyseCommentContributionsPythonComment [
 
 	| diffA diffARange addition |
@@ -157,7 +158,7 @@ GitAnalyzerLocalTest >> testAnalyseCommentContributionsPythonComment [
 	self assert: gitAnalyzer analyseCommentContribution equals: 1
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GitAnalyzerLocalTest >> testAnalyseCommentContributionsShouldBe0 [
 
 	| diffA diffARange addition |
@@ -176,7 +177,7 @@ GitAnalyzerLocalTest >> testAnalyseCommentContributionsShouldBe0 [
 	self assert: gitAnalyzer analyseCommentContribution equals: 0
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GitAnalyzerLocalTest >> testAnalyseCommentInSomeAroundCode [
 
 	| diffA diffARange addition |
@@ -195,7 +196,7 @@ GitAnalyzerLocalTest >> testAnalyseCommentInSomeAroundCode [
 	self assert: gitAnalyzer analyseCommentContribution equals: 0
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GitAnalyzerLocalTest >> testAnalyseCommentNotAnAddition [
 
 	| diffA diffARange addition |
@@ -214,7 +215,7 @@ GitAnalyzerLocalTest >> testAnalyseCommentNotAnAddition [
 	self assert: gitAnalyzer analyseCommentContribution equals: 0
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GitAnalyzerLocalTest >> testArrangeCommitsByDate [
 
 	| commitA2 commitA3 commitB result |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/GitAnalyzerTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/GitAnalyzerTest.class.st
index 142d61b..d6a7e45 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/GitAnalyzerTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/GitAnalyzerTest.class.st
@@ -2,8 +2,8 @@
 A CodeChurnAnalyzerTest is a test class for testing the behavior of CodeChurnAnalyzer
 "
 Class {
-	#name : #GitAnalyzerTest,
-	#superclass : #TestCase,
+	#name : 'GitAnalyzerTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'glphModel',
 		'glphApi',
@@ -11,17 +11,18 @@ Class {
 		'projects',
 		'gitAnalyzer'
 	],
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 GitAnalyzerTest >> setUp [
 
 	| since |
 	super setUp.
 
 	"Put here a common initialization logic for tests"
-	glphModel := GLPHEModel new.
+	glphModel := GLHModel new.
 
 	glphApi := GLPHApi new
 		           privateToken: '';
@@ -51,7 +52,7 @@ GitAnalyzerTest >> setUp [
 		               onModel: glphModel
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GitAnalyzerTest >> testAnalyseAmandment [
 
 	| myCommits res mondayCommit tuesdayCommit wednesdayCommit |
@@ -96,7 +97,7 @@ GitAnalyzerTest >> testAnalyseAmandment [
 	self assert: res equals: tuesdayCommit
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GitAnalyzerTest >> testAnalyseCommitFrequencySinceUntil [
 
 	| res from since |
@@ -115,12 +116,12 @@ GitAnalyzerTest >> testAnalyseCommitFrequencySinceUntil [
 	self assert: (res at: '14 May 2024') size equals: 4.
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GitAnalyzerTest >> testAnalyseMergeResquestValidation [
 
 	| mergeResquest res |
 	glhImporter importMergeRequests: projects anyOne.
-	mergeResquest := (glhImporter glhModel allWithType: GLPHEMergeRequest)
+	mergeResquest := (glhImporter glhModel allWithType: GLHMergeRequest)
 		                 detect: [ :mr | mr iid = 1 ].
 
 
@@ -132,7 +133,7 @@ GitAnalyzerTest >> testAnalyseMergeResquestValidation [
 		equals: (res at: #duration)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 GitAnalyzerTest >> testChurnMetric [
 
 	| myCommits res wednesdayCommit mondayCommit tuesdayCommit codeJs churn4CodeJs |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/JiraImporterMock.class.st b/src/GitLabHealth-Model-Analysis-Tests/JiraImporterMock.class.st
index f267524..0fe5fe0 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/JiraImporterMock.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/JiraImporterMock.class.st
@@ -1,46 +1,47 @@
 Class {
-	#name : #JiraImporterMock,
-	#superclass : #Object,
+	#name : 'JiraImporterMock',
+	#superclass : 'Object',
 	#instVars : [
 		'issues',
 		'model'
 	],
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #'api - import' }
+{ #category : 'api - import' }
 JiraImporterMock >> importAllCurrentAndPastIssuesOf: email [
 
 	model addAll: issues.
 	^ issues
 ]
 
-{ #category : #initialization }
+{ #category : 'initialization' }
 JiraImporterMock >> initialize [
 
 	model := GLPHEModel new name: 'model'.
 	issues := {  }.
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 JiraImporterMock >> issues [
 
 	^ issues
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 JiraImporterMock >> issues: anObject [
 
 	issues := anObject
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 JiraImporterMock >> model [
 
 	^ model
 ]
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 JiraImporterMock >> model: anObject [
 
 	model := anObject
diff --git a/src/GitLabHealth-Model-Analysis-Tests/JiraTimeMRTimeDifferenceMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/JiraTimeMRTimeDifferenceMetricTest.class.st
index 4e80cb4..0b2511e 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/JiraTimeMRTimeDifferenceMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/JiraTimeMRTimeDifferenceMetricTest.class.st
@@ -2,12 +2,13 @@
 A JiraTimeMRTimeDifferenceMetricTest is a test class for testing the behavior of JiraTimeMRTimeDifferenceMetric
 "
 Class {
-	#name : #JiraTimeMRTimeDifferenceMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'JiraTimeMRTimeDifferenceMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 JiraTimeMRTimeDifferenceMetricTest >> testCalculate [
 
 	| result glhImporter user jiraImporter jiraMRDifference |
@@ -18,7 +19,7 @@ JiraTimeMRTimeDifferenceMetricTest >> testCalculate [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
@@ -51,7 +52,7 @@ JiraTimeMRTimeDifferenceMetricTest >> testCalculate [
 	self assert: result equals: 1 hours asSeconds
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 JiraTimeMRTimeDifferenceMetricTest >> testCalculate2PeriodWith1EmptyPeriod [
 
 	| result glhImporter user jiraImporter jiraMRDifference |
@@ -62,7 +63,7 @@ JiraTimeMRTimeDifferenceMetricTest >> testCalculate2PeriodWith1EmptyPeriod [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
@@ -95,7 +96,7 @@ JiraTimeMRTimeDifferenceMetricTest >> testCalculate2PeriodWith1EmptyPeriod [
 	self assert: result equals: 1 hours /2 asSeconds
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 JiraTimeMRTimeDifferenceMetricTest >> testCalculateNoMergeRequests [
 
 	| result glhImporter user jiraImporter jiraMRDifference |
@@ -125,7 +126,7 @@ JiraTimeMRTimeDifferenceMetricTest >> testCalculateNoMergeRequests [
 	self assert: result equals: nil
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 JiraTimeMRTimeDifferenceMetricTest >> testCalculateWithNoEstimatedTime [
 
 	| result glhImporter user jiraImporter jiraMRDifference |
@@ -136,7 +137,7 @@ JiraTimeMRTimeDifferenceMetricTest >> testCalculateWithNoEstimatedTime [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
@@ -167,7 +168,7 @@ JiraTimeMRTimeDifferenceMetricTest >> testCalculateWithNoEstimatedTime [
 	self assert: result equals: nil
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 JiraTimeMRTimeDifferenceMetricTest >> testCalculateWithTimeOriginalEstimateAndNoTimeEstimate [
 
 	| result glhImporter user jiraImporter jiraMRDifference |
@@ -178,7 +179,7 @@ JiraTimeMRTimeDifferenceMetricTest >> testCalculateWithTimeOriginalEstimateAndNo
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024';
 			 merged_at: '09-06-2024' asDate;
diff --git a/src/GitLabHealth-Model-Analysis-Tests/MergeRequestDurationMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/MergeRequestDurationMetricTest.class.st
index e3b9d4b..f65aecb 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/MergeRequestDurationMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/MergeRequestDurationMetricTest.class.st
@@ -2,12 +2,13 @@
 A MergeRequestDurationMetricTest is a test class for testing the behavior of MergeRequestDurationMetric
 "
 Class {
-	#name : #MergeRequestDurationMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'MergeRequestDurationMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 MergeRequestDurationMetricTest >> testCalculate [
 
 	| result glhImporter user mergeRequestDuration |
@@ -19,11 +20,11 @@ MergeRequestDurationMetricTest >> testCalculate [
 
 	glhImporter := GLPHImporterMock new.
 	glhImporter mergeRequests: {
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
 				 created_at: '09-05-2024:00:00:00' asDateAndTime;
 				 merged_at: '09-05-2024:10:00:00' asDateAndTime).
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
 				 created_at: '09-05-2024' asDate;
 				 merged_at: nil) }.
@@ -43,7 +44,7 @@ MergeRequestDurationMetricTest >> testCalculate [
 	self assert: result equals: (10 * 60 * 60)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MergeRequestDurationMetricTest >> testCalculateNoMergeRequests [
 
 	| result glhImporter user mergeRequestDuration |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/MergedMergeRequestMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/MergedMergeRequestMetricTest.class.st
index 54727d3..37bfe72 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/MergedMergeRequestMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/MergedMergeRequestMetricTest.class.st
@@ -2,12 +2,13 @@
 A MergedMergeRequestMetricTest is a test class for testing the behavior of MergedMergeRequestMetric
 "
 Class {
-	#name : #MergedMergeRequestMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'MergedMergeRequestMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 MergedMergeRequestMetricTest >> testCalculate [
 
 	| result glhImporter user mergedMergeRequest |
@@ -19,7 +20,7 @@ MergedMergeRequestMetricTest >> testCalculate [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 		    merge_user: user;
 			 created_at: '09-05-2024';
@@ -41,32 +42,32 @@ MergedMergeRequestMetricTest >> testCalculate [
 	self assert: result equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MergedMergeRequestMetricTest >> testCalculate1MRInPeriod1Outside [
 
 	| result glhImporter user mergedMergeRequest |
 	"Given"
 	user := GLHUser new
 		        username: 'test';
-		id: 1;
+		        id: 1;
 		        contributedProjects:
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { 
-		"open and merge during the same week"
-	(GLPHEMergeRequest new
-			 author: user;
-			 merge_user: user;
-			 created_at: '09-05-2024';
-			 merged_at: '09-05-2024').
-			
+	glhImporter mergeRequests: {
+			(GLHMergeRequest new
+				 author: user;
+				 merge_user: user;
+				 created_at: '09-05-2024';
+				 merged_at: '09-05-2024').
+
 			"open but merged anotherWeek"
-			(GLPHEMergeRequest new
-			 author: user;
-			 merge_user: user;
-			 created_at: '09-05-2024';
-			 merged_at: '09-10-2024')}.
+			(GLHMergeRequest new
+				 author: user;
+				 merge_user: user;
+				 created_at: '09-05-2024';
+				 merged_at: '09-10-2024') }.
+	"open and merge during the same week"
 
 
 	mergedMergeRequest := MergedMergeRequestMetric new
@@ -83,29 +84,28 @@ MergedMergeRequestMetricTest >> testCalculate1MRInPeriod1Outside [
 	self assert: result equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MergedMergeRequestMetricTest >> testCalculate1MROpenedButNotMerged [
 
 	| result glhImporter user mergedMergeRequest |
 	"Given"
 	user := GLHUser new
 		        username: 'test';
-		id: 1;
+		        id: 1;
 		        contributedProjects:
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { 
-			(GLPHEMergeRequest new
-			 author: user;
-			 merge_user: user;
-			 created_at: '09-05-2024';
-			 merged_at: '09-05-2024').
-			(GLPHEMergeRequest new
-			 author: user;
-			 created_at: '09-05-2024';
-			 merged_at: nil)
-	}.
+	glhImporter mergeRequests: {
+			(GLHMergeRequest new
+				 author: user;
+				 merge_user: user;
+				 created_at: '09-05-2024';
+				 merged_at: '09-05-2024').
+			(GLHMergeRequest new
+				 author: user;
+				 created_at: '09-05-2024';
+				 merged_at: nil) }.
 
 
 	mergedMergeRequest := MergedMergeRequestMetric new
@@ -122,37 +122,37 @@ MergedMergeRequestMetricTest >> testCalculate1MROpenedButNotMerged [
 	self assert: result equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MergedMergeRequestMetricTest >> testCalculate2MROneForEachUser [
 
 	| result glhImporter user1 mergedMergeRequest user2 |
 	"Given"
 	user1 := GLHUser new
-		        name: 'test';
-					id: 1;
-		        contributedProjects:
-			        { (GLHProject new repository: GLHRepository new) }.
-			
+		         name: 'test';
+		         id: 1;
+		         contributedProjects:
+			         { (GLHProject new repository: GLHRepository new) }.
+
 	user2 := GLHUser new
-		        name: 'test';
-					id: 2;
-		        contributedProjects:
-			        { (GLHProject new repository: GLHRepository new) }.
+		         name: 'test';
+		         id: 2;
+		         contributedProjects:
+			         { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
-			 author: user1;
-			 title: 'MR1';
-			 created_at: '09-05-2024';
-			 merge_user: user1;
-			 merged_at: '09-05-2024')
-			.(GLPHEMergeRequest new
-			 author: user2;
-			 title: 'MR2';
-			 created_at: '09-05-2024';
-			 merge_user: user2;
-			 merged_at: '09-06-2024'
-			 )}.
+	glhImporter mergeRequests: {
+			(GLHMergeRequest new
+				 author: user1;
+				 title: 'MR1';
+				 created_at: '09-05-2024';
+				 merge_user: user1;
+				 merged_at: '09-05-2024').
+			(GLHMergeRequest new
+				 author: user2;
+				 title: 'MR2';
+				 created_at: '09-05-2024';
+				 merge_user: user2;
+				 merged_at: '09-06-2024') }.
 
 
 	mergedMergeRequest := MergedMergeRequestMetric new
@@ -169,44 +169,43 @@ MergedMergeRequestMetricTest >> testCalculate2MROneForEachUser [
 	self assert: result equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MergedMergeRequestMetricTest >> testCalculate3MROpenButMergedByOthers [
 
 	| result glhImporter user1 mergedMergeRequest user2 |
 	"Given"
 	user1 := GLHUser new
-		        name: 'test';
-				  id: 1;
-		        contributedProjects:
-			        { (GLHProject new repository: GLHRepository new) }.
-			
+		         name: 'test';
+		         id: 1;
+		         contributedProjects:
+			         { (GLHProject new repository: GLHRepository new) }.
+
 	user2 := GLHUser new
-		        name: 'test';
-				  id: 2;
-		        contributedProjects:
-			        { (GLHProject new repository: GLHRepository new) }.
+		         name: 'test';
+		         id: 2;
+		         contributedProjects:
+			         { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
-			 author: user1;
-			 title: 'MR1';
-			 created_at: '09-05-2024';
-			 merge_user: user2;
-			 merged_at: '09-05-2024').
-			(GLPHEMergeRequest new
-			 author: user1;
-			 title: 'MR2';
-			 created_at: '09-05-2024';
-			 merge_user: user2;
-			 merged_at: '09-06-2024'
-			 ).
-			(GLPHEMergeRequest new
-			 author: user1;
-			 title: 'MR3';
-			 created_at: '09-05-2024';
-			 merge_user: user2;
-			 merged_at: '09-06-2024'
-			 )}.
+	glhImporter mergeRequests: {
+			(GLHMergeRequest new
+				 author: user1;
+				 title: 'MR1';
+				 created_at: '09-05-2024';
+				 merge_user: user2;
+				 merged_at: '09-05-2024').
+			(GLHMergeRequest new
+				 author: user1;
+				 title: 'MR2';
+				 created_at: '09-05-2024';
+				 merge_user: user2;
+				 merged_at: '09-06-2024').
+			(GLHMergeRequest new
+				 author: user1;
+				 title: 'MR3';
+				 created_at: '09-05-2024';
+				 merge_user: user2;
+				 merged_at: '09-06-2024') }.
 
 
 	mergedMergeRequest := MergedMergeRequestMetric new
@@ -223,44 +222,43 @@ MergedMergeRequestMetricTest >> testCalculate3MROpenButMergedByOthers [
 	self assert: result equals: 0
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MergedMergeRequestMetricTest >> testCalculate3MROpenByOther [
 
 	| result glhImporter user1 mergedMergeRequest user2 |
 	"Given"
 	user1 := GLHUser new
-		        name: 'test';
-		id: 1;
-		        contributedProjects:
-			        { (GLHProject new repository: GLHRepository new) }.
-			
+		         name: 'test';
+		         id: 1;
+		         contributedProjects:
+			         { (GLHProject new repository: GLHRepository new) }.
+
 	user2 := GLHUser new
-		        name: 'test';
-		id: 2;
-		        contributedProjects:
-			        { (GLHProject new repository: GLHRepository new) }.
+		         name: 'test';
+		         id: 2;
+		         contributedProjects:
+			         { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
-			 author: user2;
-			 title: 'MR1';
-			 created_at: '09-05-2024';
-			 merge_user: user1;
-			 merged_at: '09-05-2024').
-			(GLPHEMergeRequest new
-			 author: user2;
-			 title: 'MR2';
-			 created_at: '09-05-2024';
-			 merge_user: user1;
-			 merged_at: '09-06-2024'
-			 ).
-			(GLPHEMergeRequest new
-			 author: user2;
-			 title: 'MR3';
-			 created_at: '09-05-2024';
-			 merge_user: user1;
-			 merged_at: '09-06-2024'
-			 )}.
+	glhImporter mergeRequests: {
+			(GLHMergeRequest new
+				 author: user2;
+				 title: 'MR1';
+				 created_at: '09-05-2024';
+				 merge_user: user1;
+				 merged_at: '09-05-2024').
+			(GLHMergeRequest new
+				 author: user2;
+				 title: 'MR2';
+				 created_at: '09-05-2024';
+				 merge_user: user1;
+				 merged_at: '09-06-2024').
+			(GLHMergeRequest new
+				 author: user2;
+				 title: 'MR3';
+				 created_at: '09-05-2024';
+				 merge_user: user1;
+				 merged_at: '09-06-2024') }.
 
 
 	mergedMergeRequest := MergedMergeRequestMetric new
@@ -277,7 +275,7 @@ MergedMergeRequestMetricTest >> testCalculate3MROpenByOther [
 	self assert: result equals: 3
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 MergedMergeRequestMetricTest >> testCalculateNoMergeRequests [ 
 
 	| result glhImporter user mergedMergeRequest |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/OpenedMergeRequestMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/OpenedMergeRequestMetricTest.class.st
index e649384..261a37f 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/OpenedMergeRequestMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/OpenedMergeRequestMetricTest.class.st
@@ -2,12 +2,13 @@
 An OpenedMergeRequestMetricTest is a test class for testing the behavior of OpenedMergeRequestMetric
 "
 Class {
-	#name : #OpenedMergeRequestMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'OpenedMergeRequestMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 OpenedMergeRequestMetricTest >> testCalculate [
 
 	| openedMergeRequest result glhImporter user user2|
@@ -25,7 +26,7 @@ OpenedMergeRequestMetricTest >> testCalculate [
 			        { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { (GLPHEMergeRequest new
+	glhImporter mergeRequests: { (GLHMergeRequest new
 			 author: user;
 			 created_at: '09-05-2024') }.
 
@@ -44,35 +45,34 @@ OpenedMergeRequestMetricTest >> testCalculate [
 	self assert: result equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 OpenedMergeRequestMetricTest >> testCalculate1OpenedAnd2NotOpenedByUser [
 
-	| openedMergeRequest result glhImporter user user2|
+	| openedMergeRequest result glhImporter user user2 |
 	"Given"
 	user := GLHUser new
 		        username: 'user';
-				  name: 'user';
+		        name: 'user';
 		        contributedProjects:
 			        { (GLHProject new repository: GLHRepository new) }.
-			
+
 	user2 := GLHUser new
-		        username: 'user2';
-				  name: 'user2';
-		        contributedProjects:
-			        { (GLHProject new repository: GLHRepository new) }.
+		         username: 'user2';
+		         name: 'user2';
+		         contributedProjects:
+			         { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { 
-			(GLPHEMergeRequest new
-			 author: user2;
-			 created_at: '09-02-2024').
-			(GLPHEMergeRequest new
-			 author: user2;
-			 created_at: '09-03-2024').
-			(GLPHEMergeRequest new
-			 author: user;
-			 created_at: '09-03-2024')
-			 }.
+	glhImporter mergeRequests: {
+			(GLHMergeRequest new
+				 author: user2;
+				 created_at: '09-02-2024').
+			(GLHMergeRequest new
+				 author: user2;
+				 created_at: '09-03-2024').
+			(GLHMergeRequest new
+				 author: user;
+				 created_at: '09-03-2024') }.
 
 
 	openedMergeRequest := OpenedMergeRequestMetric new
@@ -89,7 +89,7 @@ OpenedMergeRequestMetricTest >> testCalculate1OpenedAnd2NotOpenedByUser [
 	self assert: result equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 OpenedMergeRequestMetricTest >> testCalculateNoMergeRequests [
 
 	| openedMergeRequest result glhImporter user |
@@ -116,32 +116,31 @@ OpenedMergeRequestMetricTest >> testCalculateNoMergeRequests [
 	self assert: result equals: 0
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 OpenedMergeRequestMetricTest >> testCalculateNotOpenedByUser [
 
-	| openedMergeRequest result glhImporter user user2|
+	| openedMergeRequest result glhImporter user user2 |
 	"Given"
 	user := GLHUser new
 		        username: 'user';
-				  name: 'user';
+		        name: 'user';
 		        contributedProjects:
 			        { (GLHProject new repository: GLHRepository new) }.
-			
+
 	user2 := GLHUser new
-		        username: 'user2';
-				  name: 'user2';
-		        contributedProjects:
-			        { (GLHProject new repository: GLHRepository new) }.
+		         username: 'user2';
+		         name: 'user2';
+		         contributedProjects:
+			         { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: { 
-			(GLPHEMergeRequest new
-			 author: user2;
-			 created_at: '09-02-2024').
-			(GLPHEMergeRequest new
-			 author: user2;
-			 created_at: '09-03-2024')
-			 }.
+	glhImporter mergeRequests: {
+			(GLHMergeRequest new
+				 author: user2;
+				 created_at: '09-02-2024').
+			(GLHMergeRequest new
+				 author: user2;
+				 created_at: '09-03-2024') }.
 
 
 	openedMergeRequest := OpenedMergeRequestMetric new
diff --git a/src/GitLabHealth-Model-Analysis-Tests/PendingMergeRequestMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/PendingMergeRequestMetricTest.class.st
index b88c72f..9d46465 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/PendingMergeRequestMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/PendingMergeRequestMetricTest.class.st
@@ -2,12 +2,13 @@
 A PendingMergeRequestMetricTest is a test class for testing the behavior of PendingMergeRequestMetric
 "
 Class {
-	#name : #PendingMergeRequestMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'PendingMergeRequestMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #test }
+{ #category : 'test' }
 PendingMergeRequestMetricTest >> testCalculate [
 
 	| result glhImporter user mergedMergeRequestPending|
@@ -19,7 +20,7 @@ PendingMergeRequestMetricTest >> testCalculate [
 
 	glhImporter := GLPHImporterMock new.
 	glhImporter mergeRequests: {
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
 				 merge_user: user;
 				 created_at: '09-05-2024:00-00-00' asDateAndTime;
@@ -43,10 +44,10 @@ PendingMergeRequestMetricTest >> testCalculate [
 	self assert: result equals: 1
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 PendingMergeRequestMetricTest >> testCalculate1Pending1Closed [
 
-	| result glhImporter user mergedMergeRequestPending|
+	| result glhImporter user mergedMergeRequestPending |
 	"Given"
 	user := GLHUser new
 		        username: 'test';
@@ -55,26 +56,24 @@ PendingMergeRequestMetricTest >> testCalculate1Pending1Closed [
 
 	glhImporter := GLPHImporterMock new.
 	glhImporter mergeRequests: {
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
 				 created_at: '09-05-2024:00-00-00' asDateAndTime;
-				 state: 'opened'; 
+				 state: 'opened';
 				 merged_at: nil).
-				(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
 				 created_at: '09-01-2024:00-00-00' asDateAndTime;
-				 state: 'closed'; 
-				 merged_at: '09-02-2024:00-00-00' asDateAndTime).
-			 }.
+				 state: 'closed';
+				 merged_at: '09-02-2024:00-00-00' asDateAndTime) }.
 
 
-	mergedMergeRequestPending := PendingMergeRequestMetric 
-		                                   new
-		                                   user: user;
-		                                   glhImporter: glhImporter;
-		                                   setPeriodSince: '09-01-2024'
-		                                   until: '09-07-2024';
-		                                   over: Week.
+	mergedMergeRequestPending := PendingMergeRequestMetric new
+		                             user: user;
+		                             glhImporter: glhImporter;
+		                             setPeriodSince: '09-01-2024'
+		                             until: '09-07-2024';
+		                             over: Week.
 
 	"When"
 	result := mergedMergeRequestPending calculate.
@@ -83,44 +82,42 @@ PendingMergeRequestMetricTest >> testCalculate1Pending1Closed [
 	self assert: result equals: 1
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 PendingMergeRequestMetricTest >> testCalculate1PendingByUser [
 
-	| result glhImporter user mergedMergeRequestPending user2|
+	| result glhImporter user mergedMergeRequestPending user2 |
 	"Given"
 	user := GLHUser new
 		        username: 'user';
-				  name: 'user';
+		        name: 'user';
 		        contributedProjects:
 			        { (GLHProject new repository: GLHRepository new) }.
-			
+
 	user2 := GLHUser new
-		        username: 'user2';
-				  name: 'user2';
-		        contributedProjects:
-			        { (GLHProject new repository: GLHRepository new) }.
+		         username: 'user2';
+		         name: 'user2';
+		         contributedProjects:
+			         { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
 	glhImporter mergeRequests: {
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
 				 created_at: '09-05-2024:00-00-00' asDateAndTime;
-				 state: 'opened'; 
+				 state: 'opened';
 				 merged_at: nil).
-				(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user2;
 				 created_at: '09-01-2024:00-00-00' asDateAndTime;
-				 state: 'opened'; 
-				 merged_at: nil).
-			 }.
+				 state: 'opened';
+				 merged_at: nil) }.
 
-	mergedMergeRequestPending := PendingMergeRequestMetric 
-		                                   new
-		                                   user: user;
-		                                   glhImporter: glhImporter;
-		                                   setPeriodSince: '09-01-2024'
-		                                   until: '09-07-2024';
-		                                   over: Week.
+	mergedMergeRequestPending := PendingMergeRequestMetric new
+		                             user: user;
+		                             glhImporter: glhImporter;
+		                             setPeriodSince: '09-01-2024'
+		                             until: '09-07-2024';
+		                             over: Week.
 
 	"When"
 	result := mergedMergeRequestPending calculate.
@@ -129,44 +126,42 @@ PendingMergeRequestMetricTest >> testCalculate1PendingByUser [
 	self assert: result equals: 1
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 PendingMergeRequestMetricTest >> testCalculate2Pending [
 
-	| result glhImporter user mergedMergeRequestPending user2|
+	| result glhImporter user mergedMergeRequestPending user2 |
 	"Given"
 	user := GLHUser new
 		        username: 'user';
-				  name: 'user';
+		        name: 'user';
 		        contributedProjects:
 			        { (GLHProject new repository: GLHRepository new) }.
-			
+
 	user2 := GLHUser new
-		        username: 'user2';
-				  name: 'user2';
-		        contributedProjects:
-			        { (GLHProject new repository: GLHRepository new) }.
+		         username: 'user2';
+		         name: 'user2';
+		         contributedProjects:
+			         { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
 	glhImporter mergeRequests: {
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
 				 created_at: '09-05-2024:00-00-00' asDateAndTime;
-				 state: 'opened'; 
+				 state: 'opened';
 				 merged_at: nil).
-				(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
 				 created_at: '09-02-2024:00-00-00' asDateAndTime;
-				 state: 'opened'; 
-				 merged_at: nil).
-			 }.
-
-	mergedMergeRequestPending := PendingMergeRequestMetric 
-		                                   new
-		                                   user: user;
-		                                   glhImporter: glhImporter;
-		                                   setPeriodSince: '09-01-2024'
-		                                   until: '09-07-2024';
-		                                   over: Week.
+				 state: 'opened';
+				 merged_at: nil) }.
+
+	mergedMergeRequestPending := PendingMergeRequestMetric new
+		                             user: user;
+		                             glhImporter: glhImporter;
+		                             setPeriodSince: '09-01-2024'
+		                             until: '09-07-2024';
+		                             over: Week.
 
 	"When"
 	result := mergedMergeRequestPending calculate.
diff --git a/src/GitLabHealth-Model-Analysis-Tests/ReviewedByUserMergeRequestMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/ReviewedByUserMergeRequestMetricTest.class.st
index d366be3..ecbdecc 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/ReviewedByUserMergeRequestMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/ReviewedByUserMergeRequestMetricTest.class.st
@@ -2,47 +2,46 @@
 A ReviewedByUserMergeRequestMetricTest is a test class for testing the behavior of ReviewedByUserMergeRequestMetric
 "
 Class {
-	#name : #ReviewedByUserMergeRequestMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'ReviewedByUserMergeRequestMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #test }
+{ #category : 'test' }
 ReviewedByUserMergeRequestMetricTest >> testCalculate [
 
-	| result glhImporter user mergeRequests user2|
+	| result glhImporter user mergeRequests user2 |
 	"Given"
 	user := GLHUser new
 		        name: 'testUser';
 		        contributedProjects:
 			        { (GLHProject new repository: GLHRepository new) }.
-				user2 := GLHUser new
-		        name: 'testUser2';
-		        contributedProjects:
-			        { (GLHProject new repository: GLHRepository new) }.
+	user2 := GLHUser new
+		         name: 'testUser2';
+		         contributedProjects:
+			         { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
 	glhImporter mergeRequests: {
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
 				 merge_user: user;
 				 reviewers: { user };
 				 created_at: '09-05-2024:00-00-00' asDateAndTime;
 				 merged_at: '09-05-2024:00-00-01' asDateAndTime).
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
-				merge_user: nil;
+				 merge_user: nil;
 				 created_at: '09-05-2024:00-00-00' asDateAndTime;
 				 merged_at: '09-05-2024:00-00-01' asDateAndTime) }.
 
 
-	mergeRequests := ReviewedByUserMergeRequestMetric
-		                                   new
-		                                   user: user;
-		                                   glhImporter: glhImporter;
-		                                   setPeriodSince: '09-04-2024'
-		                                   until: '09-04-2024';
-		                                   over: Week.
+	mergeRequests := ReviewedByUserMergeRequestMetric new
+		                 user: user;
+		                 glhImporter: glhImporter;
+		                 setPeriodSince: '09-04-2024' until: '09-04-2024';
+		                 over: Week.
 
 	"When"
 	result := mergeRequests calculate.
@@ -51,7 +50,7 @@ ReviewedByUserMergeRequestMetricTest >> testCalculate [
 	self assert: result equals: 1
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 ReviewedByUserMergeRequestMetricTest >> testCalculateNoMergeRequests [ 
 
 	| result glhImporter user mergeRequests |
@@ -80,7 +79,7 @@ ReviewedByUserMergeRequestMetricTest >> testCalculateNoMergeRequests [
 	self assert: result equals: 0
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 ReviewedByUserMergeRequestMetricTest >> testCalculateReviewButNotCreated [
 
 	| result glhImporter user mergedMergeRequestWithoutReview user2 |
@@ -95,13 +94,12 @@ ReviewedByUserMergeRequestMetricTest >> testCalculateReviewButNotCreated [
 			         { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
-	glhImporter mergeRequests: {
-			(GLPHEMergeRequest new
-				 author: user2;
-				 merge_user: user2;
-				 reviewers: { user };
-				 created_at: '09-05-2024:00-00-00' asDateAndTime;
-				 merged_at: '09-05-2024:00-00-01' asDateAndTime). }.
+	glhImporter mergeRequests: { (GLHMergeRequest new
+			 author: user2;
+			 merge_user: user2;
+			 reviewers: { user };
+			 created_at: '09-05-2024:00-00-00' asDateAndTime;
+			 merged_at: '09-05-2024:00-00-01' asDateAndTime) }.
 
 
 	mergedMergeRequestWithoutReview := ReviewedByUserMergeRequestMetric
@@ -119,37 +117,37 @@ ReviewedByUserMergeRequestMetricTest >> testCalculateReviewButNotCreated [
 	self assert: result equals: 1
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 ReviewedByUserMergeRequestMetricTest >> testCalculateReviewByOther [
 
-	| result glhImporter user mergedMergeRequestWithoutReview user2|
+	| result glhImporter user mergedMergeRequestWithoutReview user2 |
 	"Given"
 	user := GLHUser new
 		        name: 'testUser';
 		        contributedProjects:
 			        { (GLHProject new repository: GLHRepository new) }.
-				user2 := GLHUser new
-		        name: 'testUser2';
-		        contributedProjects:
-			        { (GLHProject new repository: GLHRepository new) }.
+	user2 := GLHUser new
+		         name: 'testUser2';
+		         contributedProjects:
+			         { (GLHProject new repository: GLHRepository new) }.
 
 	glhImporter := GLPHImporterMock new.
 	glhImporter mergeRequests: {
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
 				 merge_user: user;
 				 reviewers: { user2 };
 				 created_at: '09-05-2024:00-00-00' asDateAndTime;
 				 merged_at: '09-05-2024:00-00-01' asDateAndTime).
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
 				 merge_user: user2;
 				 reviewers: { user2 };
 				 created_at: '09-05-2024:00-00-00' asDateAndTime;
-				 merged_at: '09-05-2024:00-00-01' asDateAndTime). }.
+				 merged_at: '09-05-2024:00-00-01' asDateAndTime) }.
 
 
-	mergedMergeRequestWithoutReview := ReviewedByUserMergeRequestMetric 
+	mergedMergeRequestWithoutReview := ReviewedByUserMergeRequestMetric
 		                                   new
 		                                   user: user;
 		                                   glhImporter: glhImporter;
diff --git a/src/GitLabHealth-Model-Analysis-Tests/SelfMergedUnderAMinuteMergeRequestMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/SelfMergedUnderAMinuteMergeRequestMetricTest.class.st
index f7b0444..94bc2c8 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/SelfMergedUnderAMinuteMergeRequestMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/SelfMergedUnderAMinuteMergeRequestMetricTest.class.st
@@ -2,12 +2,13 @@
 A MergedMergeRequestWithoutReviewMetricTest is a test class for testing the behavior of MergedMergeRequestWithoutReviewMetric
 "
 Class {
-	#name : #SelfMergedUnderAMinuteMergeRequestMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'SelfMergedUnderAMinuteMergeRequestMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 SelfMergedUnderAMinuteMergeRequestMetricTest >> testCalculate [
 
 	| result glhImporter user mergedMergeRequestWithoutReview |
@@ -19,15 +20,15 @@ SelfMergedUnderAMinuteMergeRequestMetricTest >> testCalculate [
 
 	glhImporter := GLPHImporterMock new.
 	glhImporter mergeRequests: {
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
 				 merge_user: user;
 				 reviewers: { user };
 				 created_at: '09-05-2024:00-00-00' asDateAndTime;
 				 merged_at: '09-05-2024:00-00-01' asDateAndTime).
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
-				merge_user: nil;
+				 merge_user: nil;
 				 created_at: '09-05-2024:00-00-00' asDateAndTime;
 				 merged_at: '09-05-2024:00-00-01' asDateAndTime) }.
 
@@ -47,7 +48,7 @@ SelfMergedUnderAMinuteMergeRequestMetricTest >> testCalculate [
 	self assert: result equals: 1
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 SelfMergedUnderAMinuteMergeRequestMetricTest >> testCalculateMergeButNotCreated [
 
 	| result glhImporter user mergedMergeRequestWithoutReview user2 |
@@ -64,13 +65,13 @@ SelfMergedUnderAMinuteMergeRequestMetricTest >> testCalculateMergeButNotCreated
 
 	glhImporter := GLPHImporterMock new.
 	glhImporter mergeRequests: {
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user2;
 				 merge_user: user;
 				 reviewers: { user };
 				 created_at: '09-05-2024:00-00-00' asDateAndTime;
 				 merged_at: '09-05-2024:00-00-01' asDateAndTime).
-			(GLPHEMergeRequest new
+			(GLHMergeRequest new
 				 author: user;
 				 merge_user: nil;
 				 created_at: '09-05-2024:00-00-00' asDateAndTime;
@@ -92,7 +93,7 @@ SelfMergedUnderAMinuteMergeRequestMetricTest >> testCalculateMergeButNotCreated
 	self assert: result equals: 0
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 SelfMergedUnderAMinuteMergeRequestMetricTest >> testCalculateNoMergeRequests [
 
 	| result glhImporter user mergedMergeRequestWithoutReview |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/TimeBetweenCommitMetricTest.class.st b/src/GitLabHealth-Model-Analysis-Tests/TimeBetweenCommitMetricTest.class.st
index 9aacf50..22c1f81 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/TimeBetweenCommitMetricTest.class.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/TimeBetweenCommitMetricTest.class.st
@@ -2,12 +2,13 @@
 A TimeBetweenCommitMetricTest is a test class for testing the behavior of TimeBetweenCommitMetric
 "
 Class {
-	#name : #TimeBetweenCommitMetricTest,
-	#superclass : #TestCase,
-	#category : #'GitLabHealth-Model-Analysis-Tests'
+	#name : 'TimeBetweenCommitMetricTest',
+	#superclass : 'TestCase',
+	#category : 'GitLabHealth-Model-Analysis-Tests',
+	#package : 'GitLabHealth-Model-Analysis-Tests'
 }
 
-{ #category : #tests }
+{ #category : 'tests' }
 TimeBetweenCommitMetricTest >> testCalculate [
 
 	| user glhImporter result timeBetweenCommit |
@@ -47,7 +48,7 @@ TimeBetweenCommitMetricTest >> testCalculate [
 	self assert: result equals: (23 hours asSeconds)
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 TimeBetweenCommitMetricTest >> testCalculateNoCommits [
 
 	| user glhImporter result timeBetweenCommit |
diff --git a/src/GitLabHealth-Model-Analysis-Tests/package.st b/src/GitLabHealth-Model-Analysis-Tests/package.st
index b9ed58f..f2a131a 100644
--- a/src/GitLabHealth-Model-Analysis-Tests/package.st
+++ b/src/GitLabHealth-Model-Analysis-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'GitLabHealth-Model-Analysis-Tests' }
+Package { #name : 'GitLabHealth-Model-Analysis-Tests' }
diff --git a/src/GitLabHealth-Model-Importer-Tests/GLHApiMock.class.st b/src/GitLabHealth-Model-Importer-Tests/GLHApiMock.class.st
index 8ccfe28..c2ef948 100644
--- a/src/GitLabHealth-Model-Importer-Tests/GLHApiMock.class.st
+++ b/src/GitLabHealth-Model-Importer-Tests/GLHApiMock.class.st
@@ -1,10 +1,11 @@
 Class {
-	#name : #GLHApiMock,
-	#superclass : #GLHApi,
-	#category : #'GitLabHealth-Model-Importer-Tests'
+	#name : 'GLHApiMock',
+	#superclass : 'GLHApi',
+	#category : 'GitLabHealth-Model-Importer-Tests',
+	#package : 'GitLabHealth-Model-Importer-Tests'
 }
 
-{ #category : #'api - commits' }
+{ #category : 'api - commits' }
 GLHApiMock >> commitDiff: aCommitID ofProject: aProjectId unidiff: aBoolean [
 
 	aCommitID = 'createError' ifTrue: [
diff --git a/src/GitLabHealth-Model-Importer-Tests/GLHModelImporterLocalTest.class.st b/src/GitLabHealth-Model-Importer-Tests/GLHModelImporterLocalTest.class.st
index d11f892..06e4471 100644
--- a/src/GitLabHealth-Model-Importer-Tests/GLHModelImporterLocalTest.class.st
+++ b/src/GitLabHealth-Model-Importer-Tests/GLHModelImporterLocalTest.class.st
@@ -2,27 +2,28 @@
 The test suite for `GLHModelImporter` but not using remote API
 "
 Class {
-	#name : #GLHModelImporterLocalTest,
-	#superclass : #TestCase,
+	#name : 'GLHModelImporterLocalTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'importer',
 		'model'
 	],
-	#category : #'GitLabHealth-Model-Importer-Tests'
+	#category : 'GitLabHealth-Model-Importer-Tests',
+	#package : 'GitLabHealth-Model-Importer-Tests'
 }
 
-{ #category : #running }
+{ #category : 'running' }
 GLHModelImporterLocalTest >> setUp [
 
 	super setUp.
 
 	importer := GLHModelImporter new.
-	model := GLPHEModel new.
+	model := GLHModel new.
 	importer glhModel: model.
 	importer glhApi: GLHApiMock new
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 GLHModelImporterLocalTest >> testImportDiffOfCommitWithServerRaiseError [
 
 	| commit repo project |
@@ -36,7 +37,7 @@ GLHModelImporterLocalTest >> testImportDiffOfCommitWithServerRaiseError [
 	self assert: commit diffs isEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 GLHModelImporterLocalTest >> testImportUserAlreadyInModel [
 
 	| user |
@@ -47,7 +48,7 @@ GLHModelImporterLocalTest >> testImportUserAlreadyInModel [
 	self assert: (importer importUser: 12) equals: user
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 GLHModelImporterLocalTest >> testIsServerError [
 
 	self assert:
diff --git a/src/GitLabHealth-Model-Importer-Tests/GLHModelImporterTest.class.st b/src/GitLabHealth-Model-Importer-Tests/GLHModelImporterTest.class.st
index 06c1036..f033e85 100644
--- a/src/GitLabHealth-Model-Importer-Tests/GLHModelImporterTest.class.st
+++ b/src/GitLabHealth-Model-Importer-Tests/GLHModelImporterTest.class.st
@@ -2,36 +2,37 @@
 A GLHModelImporterTest is a test class for testing the behavior of GLHModelImporter
 "
 Class {
-	#name : #GLHModelImporterTest,
-	#superclass : #TestCase,
+	#name : 'GLHModelImporterTest',
+	#superclass : 'TestCase',
 	#instVars : [
 		'glphModel',
 		'glphApi',
 		'since',
 		'glhImporter'
 	],
-	#category : #'GitLabHealth-Model-Importer-Tests'
+	#category : 'GitLabHealth-Model-Importer-Tests',
+	#package : 'GitLabHealth-Model-Importer-Tests'
 }
 
-{ #category : #accessing }
+{ #category : 'accessing' }
 GLHModelImporterTest class >> resources [
 
 	^ Array with: GLHModelImporterTestResource
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 GLHModelImporterTest >> glhImporter [
 
 	^ self class resources first current glhImporter
 ]
 
-{ #category : #running }
+{ #category : 'running' }
 GLHModelImporterTest >> model [
 
 	^ self class resources first current model
 ]
 
-{ #category : #test }
+{ #category : 'test' }
 GLHModelImporterTest >> testFilterCommitChanges [
 
 	| importer collection resultCollection |
@@ -52,7 +53,7 @@ GLHModelImporterTest >> testFilterCommitChanges [
 	self assert: resultCollection size equals: 7
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 GLHModelImporterTest >> testImportBranch [
 
 	| testCodeChurnRepository |
@@ -61,7 +62,7 @@ GLHModelImporterTest >> testImportBranch [
 	self assert: testCodeChurnRepository branches isNotEmpty
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 GLHModelImporterTest >> testImportCommits [
 
 	| projectTestCodeChurn |
@@ -74,7 +75,7 @@ GLHModelImporterTest >> testImportCommits [
 		equals: 'Nicolas Hlad'
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 GLHModelImporterTest >> testImportGroup [
 
 	| evrefGroup |
@@ -86,7 +87,7 @@ GLHModelImporterTest >> testImportGroup [
 		(evrefGroup projects anySatisfy: [ :project | project id = 57841283 ])
 ]
 
-{ #category : #tests }
+{ #category : 'tests' }
 GLHModelImporterTest >> testImportProject [
 
 	self assert: (self model allWithType: GLHProject) size equals: 1.
diff --git a/src/GitLabHealth-Model-Importer-Tests/GLHModelImporterTestResource.class.st b/src/GitLabHealth-Model-Importer-Tests/GLHModelImporterTestResource.class.st
index b4a4b6d..09becdc 100644
--- a/src/GitLabHealth-Model-Importer-Tests/GLHModelImporterTestResource.class.st
+++ b/src/GitLabHealth-Model-Importer-Tests/GLHModelImporterTestResource.class.st
@@ -1,20 +1,21 @@
 Class {
-	#name : #GLHModelImporterTestResource,
-	#superclass : #MooseModelTestResource,
+	#name : 'GLHModelImporterTestResource',
+	#superclass : 'MooseModelTestResource',
 	#instVars : [
 		'glphApi',
 		'glhImporter'
 	],
-	#category : 'GitLabHealth-Model-Importer-Tests'
+	#category : 'GitLabHealth-Model-Importer-Tests',
+	#package : 'GitLabHealth-Model-Importer-Tests'
 }
 
-{ #category : #setup }
+{ #category : 'setup' }
 GLHModelImporterTestResource >> glhImporter [
 
 	^ glhImporter
 ]
 
-{ #category : #setup }
+{ #category : 'setup' }
 GLHModelImporterTestResource >> importModel [
 
 	model := GLPHEModel new.
diff --git a/src/GitLabHealth-Model-Importer-Tests/package.st b/src/GitLabHealth-Model-Importer-Tests/package.st
index 41aade7..c8e2168 100644
--- a/src/GitLabHealth-Model-Importer-Tests/package.st
+++ b/src/GitLabHealth-Model-Importer-Tests/package.st
@@ -1 +1 @@
-Package { #name : #'GitLabHealth-Model-Importer-Tests' }
+Package { #name : 'GitLabHealth-Model-Importer-Tests' }
diff --git a/src/GitLabHealth-Model-Tests/GLHChangeTest.class.st b/src/GitLabHealth-Model-Tests/GLHChangeTest.class.st
index 512d06c..e6f39c8 100644
--- a/src/GitLabHealth-Model-Tests/GLHChangeTest.class.st
+++ b/src/GitLabHealth-Model-Tests/GLHChangeTest.class.st
@@ -14,7 +14,7 @@ GLHChangeTest >> testNewEntityFromString [
 
 	| change |
 	change := GLHChange newFrom: '+ helloWorld'.
-	self assert: change class equals: GLPHEAddition.
+	self assert: change class equals: GLHAddition.
 	self assert: change sourceCode equals: '+ helloWorld'
 ]
 
@@ -22,8 +22,8 @@ GLHChangeTest >> testNewEntityFromString [
 GLHChangeTest >> testNewEntityFromStringDeletion [
 
 	| change |
-	change := GLPHEChange newFrom: '- helloWorld'.
-	self assert: change class equals: GLPHEDeletion.
+	change := GLHChange newFrom: '- helloWorld'.
+	self assert: change class equals: GLHDeletion.
 	self assert: change sourceCode equals: '- helloWorld'
 ]
 
@@ -31,7 +31,7 @@ GLHChangeTest >> testNewEntityFromStringDeletion [
 GLHChangeTest >> testNewEntityFromStringLOC [
 
 	| change |
-	change := GLPHEChange newFrom: 'helloWorld'.
-	self assert: change class equals: GLPHELineOfCode.
+	change := GLHChange newFrom: 'helloWorld'.
+	self assert: change class equals: GLHLineOfCode.
 	self assert: change sourceCode equals: 'helloWorld'
 ]
diff --git a/src/GitLabHealth-Model-Tests/GLHDiffRangeTest.class.st b/src/GitLabHealth-Model-Tests/GLHDiffRangeTest.class.st
index 76706f8..ad0da2d 100644
--- a/src/GitLabHealth-Model-Tests/GLHDiffRangeTest.class.st
+++ b/src/GitLabHealth-Model-Tests/GLHDiffRangeTest.class.st
@@ -13,7 +13,7 @@ Class {
 GLHDiffRangeTest >> testNewEntityFromString [
 
 	| diffRange |
-	diffRange := GLPHEDiffRange newFrom:
+	diffRange := GLHDiffRange newFrom:
 		             '@@ -15,9 +15,9 @@ LLMModifierTest >> testGetViolationsMessage ['.
 	self assert: diffRange originalLineRange equals: '-15,9'.
 	self assert: diffRange newLineRange equals: '+15,9'
@@ -23,7 +23,7 @@ GLHDiffRangeTest >> testNewEntityFromString [
 GLHDiffRangeTest >> testNewEntityFromStringWithDifferentValues [
 
 	| diffRange |
-	diffRange := GLPHEDiffRange newFrom:
+	diffRange := GLHDiffRange newFrom:
 		             '@@ -15,7 +15,8 @@ LLMModifier >> getViolationsMessage: violations ['.
 	self assert: diffRange originalLineRange equals: '-15,7'.
 	self assert: diffRange newLineRange equals: '+15,8'
diff --git a/src/GitLabProjectHealth-Model-Importer-Tests/GLPHModelImporterMergeRequestTest.class.st b/src/GitLabProjectHealth-Model-Importer-Tests/GLPHModelImporterMergeRequestTest.class.st
index 53d241f..ea19df2 100644
--- a/src/GitLabProjectHealth-Model-Importer-Tests/GLPHModelImporterMergeRequestTest.class.st
+++ b/src/GitLabProjectHealth-Model-Importer-Tests/GLPHModelImporterMergeRequestTest.class.st
@@ -18,7 +18,7 @@ GLPHModelImporterMergeRequestTest >> setUp [
 	super setUp.
 	glhImporter := GLPHModelImporter new.
 	glhImporter glhApi: GLPHApiMock new.
-	glhModel := GLPHEModel new.
+	glhModel := GLHModel new.
 	glhImporter glhModel: glhModel.
 	gitlabMergeData := '[
 		{"id":46074,
diff --git a/src/GitLabProjectHealth-Model-Importer-Tests/GLPHModelImporterTest.class.st b/src/GitLabProjectHealth-Model-Importer-Tests/GLPHModelImporterTest.class.st
index 25df437..5f6824d 100644
--- a/src/GitLabProjectHealth-Model-Importer-Tests/GLPHModelImporterTest.class.st
+++ b/src/GitLabProjectHealth-Model-Importer-Tests/GLPHModelImporterTest.class.st
@@ -19,7 +19,7 @@ GLPHModelImporterTest >> setUp [
 
 	super setUp.
 	glhImporter := GLPHModelImporter new.
-	glhModel := GLPHEModel new.
+	glhModel := GLHModel new.
 	glhImporter glhModel: glhModel.
 	gitlabDiffData := '[{"b_mode":"100644","diff":"@@ -80,5 +80,10 @@ test test test {\r     test test<test[]> test(@test test<test>[] test) test test, test {\r     \ttest test(test.test(test), test.test_test, test);\r     }\r+    \r+    @test(\"/testAvisMandtestement\")\r+    test test<test[]> testAvisMandtestement(@test test<test>[] test) test test, test {\r+    \ttest test(test.testAvisMandtestement(test), test.test_test, test);\r+    }\r \r }\r\\ test test test test test test\r","new_path":"@@ -80,5 +80,10 @@ test test test {\r     test test<test[]> test(@test test<test>[] test) test test, test {\r     \ttest test(test.test(test), test.test_test, test);\r     }\r+    \r+    @test(\"/testAvisMandtestement\")\r+    test test<test[]> testAvisMandtestement(@test test<test>[] test) test test, test {\r+    \ttest test(test.testAvisMandtestement(test), test.test_test, test);\r+    }\r \r }\r\\ test test test test test test\r","a_mode":"100644","old_path":"@@ -80,5 +80,10 @@ test test test {\r     test test<test[]> test(@test test<test>[] test) test test, test {\r     \ttest test(test.test(test), test.test_test, test);\r     }\r+    \r+    @test(\"/testAvisMandtestement\")\r+    test test<test[]> testAvisMandtestement(@test test<test>[] test) test test, test {\r+    \ttest test(test.testAvisMandtestement(test), test.test_test, test);\r+    }\r \r }\r\\ test test test test test test\r","new_file":false,"deleted_file":false,"renamed_file":false},{"b_mode":"100644","diff":"@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;\n import fr.bl.avenir.gf.rest.ecompta.edition.enums.TypeBordereauVolet;\n import fr.bl.avenir.gf.rest.ecompta.edition.enums.TypeReportEnumeration;\n import fr.bl.avenir.gf.rest.ecompta.edition.service.avis.ServiceImprimerAvis;\n+import fr.bl.avenir.gf.rest.ecompta.edition.service.avismandatement.ServiceImprimerAvisMandatement;\n import fr.bl.avenir.gf.rest.ecompta.edition.service.bordereau.ServiceImprimerBordereauMandat;\n import fr.bl.avenir.gf.rest.ecompta.edition.service.bordereau.ServiceImprimerBordereauTitre;\n import fr.magnus.reftechnique.transverse.EntiteRelationnelle;\n@@ -26,12 +27,12 @@ public class EditionService {\n \n     @Autowired\n     ServiceImprimerBordereauMandat serviceImprimerBordereauMandat;\n-    \n     @Autowired\n     ServiceImprimerBordereauTitre serviceImprimerBordereauTitre;\n-    \n     @Autowired\n     ServiceImprimerAvis serviceImprimerAvis;\n+    @Autowired\n+    ServiceImprimerAvis serviceImprimerAvisMandatement;\n \n     public byte[] imprimerBordereauMandatVolet1( TableauAbstract<EntiteRelationnelle>[] jsonData) throws JRException,  ParseException {\n         Map<String, Object> params = new HashMap<>();\n@@ -85,6 +86,10 @@ public class EditionService {\n     \treturn serviceImprimerAvis.imprimerFichier(jsonData, params, TypeReportEnumeration.AVIS_SOMMES_A_PAYER_SANS_EXP);\n     }\n \t\n-        \n+    public byte[] imprimerAvisMandatement(TableauAbstract<EntiteRelationnelle>[] jsonData) throws JRException, ParseException {\n+    \treturn serviceImprimerAvisMandatement.imprimerFichier(jsonData, null, TypeReportEnumeration.AVIS_MANDATEMENT);\n+    }\n+    \n+    \n \n }\n\\ No newline at end of file\n","new_path":"@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;\n import fr.bl.avenir.gf.rest.ecompta.edition.enums.TypeBordereauVolet;\n import fr.bl.avenir.gf.rest.ecompta.edition.enums.TypeReportEnumeration;\n import fr.bl.avenir.gf.rest.ecompta.edition.service.avis.ServiceImprimerAvis;\n+import fr.bl.avenir.gf.rest.ecompta.edition.service.avismandatement.ServiceImprimerAvisMandatement;\n import fr.bl.avenir.gf.rest.ecompta.edition.service.bordereau.ServiceImprimerBordereauMandat;\n import fr.bl.avenir.gf.rest.ecompta.edition.service.bordereau.ServiceImprimerBordereauTitre;\n import fr.magnus.reftechnique.transverse.EntiteRelationnelle;\n@@ -26,12 +27,12 @@ public class EditionService {\n \n     @Autowired\n     ServiceImprimerBordereauMandat serviceImprimerBordereauMandat;\n-    \n     @Autowired\n     ServiceImprimerBordereauTitre serviceImprimerBordereauTitre;\n-    \n     @Autowired\n     ServiceImprimerAvis serviceImprimerAvis;\n+    @Autowired\n+    ServiceImprimerAvis serviceImprimerAvisMandatement;\n \n     public byte[] imprimerBordereauMandatVolet1( TableauAbstract<EntiteRelationnelle>[] jsonData) throws JRException,  ParseException {\n         Map<String, Object> params = new HashMap<>();\n@@ -85,6 +86,10 @@ public class EditionService {\n     \treturn serviceImprimerAvis.imprimerFichier(jsonData, params, TypeReportEnumeration.AVIS_SOMMES_A_PAYER_SANS_EXP);\n     }\n \t\n-        \n+    public byte[] imprimerAvisMandatement(TableauAbstract<EntiteRelationnelle>[] jsonData) throws JRException, ParseException {\n+    \treturn serviceImprimerAvisMandatement.imprimerFichier(jsonData, null, TypeReportEnumeration.AVIS_MANDATEMENT);\n+    }\n+    \n+    \n \n }\n\\ No newline at end of file\n","a_mode":"100644","old_path":"@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;\n import fr.bl.avenir.gf.rest.ecompta.edition.enums.TypeBordereauVolet;\n import fr.bl.avenir.gf.rest.ecompta.edition.enums.TypeReportEnumeration;\n import fr.bl.avenir.gf.rest.ecompta.edition.service.avis.ServiceImprimerAvis;\n+import fr.bl.avenir.gf.rest.ecompta.edition.service.avismandatement.ServiceImprimerAvisMandatement;\n import fr.bl.avenir.gf.rest.ecompta.edition.service.bordereau.ServiceImprimerBordereauMandat;\n import fr.bl.avenir.gf.rest.ecompta.edition.service.bordereau.ServiceImprimerBordereauTitre;\n import fr.magnus.reftechnique.transverse.EntiteRelationnelle;\n@@ -26,12 +27,12 @@ public class EditionService {\n \n     @Autowired\n     ServiceImprimerBordereauMandat serviceImprimerBordereauMandat;\n-    \n     @Autowired\n     ServiceImprimerBordereauTitre serviceImprimerBordereauTitre;\n-    \n     @Autowired\n     ServiceImprimerAvis serviceImprimerAvis;\n+    @Autowired\n+    ServiceImprimerAvis serviceImprimerAvisMandatement;\n \n     public byte[] imprimerBordereauMandatVolet1( TableauAbstract<EntiteRelationnelle>[] jsonData) throws JRException,  ParseException {\n         Map<String, Object> params = new HashMap<>();\n@@ -85,6 +86,10 @@ public class EditionService {\n     \treturn serviceImprimerAvis.imprimerFichier(jsonData, params, TypeReportEnumeration.AVIS_SOMMES_A_PAYER_SANS_EXP);\n     }\n \t\n-        \n+    public byte[] imprimerAvisMandatement(TableauAbstract<EntiteRelationnelle>[] jsonData) throws JRException, ParseException {\n+    \treturn serviceImprimerAvisMandatement.imprimerFichier(jsonData, null, TypeReportEnumeration.AVIS_MANDATEMENT);\n+    }\n+    \n+    \n \n }\n\\ No newline at end of file\n","new_file":false,"deleted_file":false,"renamed_file":false},{"b_mode":"100644","diff":"@@ -0,0 +1,25 @@\n+package fr.bl.avenir.gf.rest.ecompta.edition.dto.avismandatement;\n+\n+import lombok.Getter;\n+import lombok.NoArgsConstructor;\n+import lombok.Setter;\n+\n+@NoArgsConstructor\n+@Getter\n+@Setter\n+public class DTOAvisMandatement  {\n+\tprivate String collectiviteLogo;\n+\tprivate String collectiviteNom;\n+\tprivate String collectiviteAdresse;\n+\tprivate String collectiviteSignataire;\n+\tprivate String collectiviteSignature;\n+\tprivate String collectiviteTampon;\n+\tprivate String tiersNom;\n+\tprivate String tiersAdresse;\n+\tprivate String texteCourrier;\n+\tprivate String pieceJustificative;\n+\tprivate String pieceJustificativePjIdUnique;\n+\tprivate String observation;\n+\tprivate String comptableAssignataire;\n+\tprivate String contexte;\n+}\n","new_path":"@@ -0,0 +1,25 @@\n+package fr.bl.avenir.gf.rest.ecompta.edition.dto.avismandatement;\n+\n+import lombok.Getter;\n+import lombok.NoArgsConstructor;\n+import lombok.Setter;\n+\n+@NoArgsConstructor\n+@Getter\n+@Setter\n+public class DTOAvisMandatement  {\n+\tprivate String collectiviteLogo;\n+\tprivate String collectiviteNom;\n+\tprivate String collectiviteAdresse;\n+\tprivate String collectiviteSignataire;\n+\tprivate String collectiviteSignature;\n+\tprivate String collectiviteTampon;\n+\tprivate String tiersNom;\n+\tprivate String tiersAdresse;\n+\tprivate String texteCourrier;\n+\tprivate String pieceJustificative;\n+\tprivate String pieceJustificativePjIdUnique;\n+\tprivate String observation;\n+\tprivate String comptableAssignataire;\n+\tprivate String contexte;\n+}\n","a_mode":"0","old_path":"@@ -0,0 +1,25 @@\n+package fr.bl.avenir.gf.rest.ecompta.edition.dto.avismandatement;\n+\n+import lombok.Getter;\n+import lombok.NoArgsConstructor;\n+import lombok.Setter;\n+\n+@NoArgsConstructor\n+@Getter\n+@Setter\n+public class DTOAvisMandatement  {\n+\tprivate String collectiviteLogo;\n+\tprivate String collectiviteNom;\n+\tprivate String collectiviteAdresse;\n+\tprivate String collectiviteSignataire;\n+\tprivate String collectiviteSignature;\n+\tprivate String collectiviteTampon;\n+\tprivate String tiersNom;\n+\tprivate String tiersAdresse;\n+\tprivate String texteCourrier;\n+\tprivate String pieceJustificative;\n+\tprivate String pieceJustificativePjIdUnique;\n+\tprivate String observation;\n+\tprivate String comptableAssignataire;\n+\tprivate String contexte;\n+}\n","new_file":true,"deleted_file":false,"renamed_file":false},{"b_mode":"100644","diff":"@@ -34,7 +34,6 @@ public class TypeReportEnumeration extends EnumerationAbstract {\n     public static final TypeReportEnumeration TITRE_VOLET2 = new TypeReportEnumeration(6, \"Bordereau de titres Volet 2\", JASPER_REPORT_BORDEREAU_TITRE);\n     public static final TypeReportEnumeration TITRE_VOLET3 = new TypeReportEnumeration(7, \"Bordereau de titres Volet 3\", JASPER_REPORT_BORDEREAU_TITRE);\n     public static final TypeReportEnumeration TITRE = new TypeReportEnumeration(8, \"Bordereau de titres\", JASPER_REPORT_BORDEREAU_TITRE);\n-    private JasperReport jasperReport;\n \n \t// --- AVIS\n     private static final String JASPER_AVIS_REPOSITORY = \"/jasper/avis/\";\n@@ -44,7 +43,13 @@ public class TypeReportEnumeration extends EnumerationAbstract {\n     public static final TypeReportEnumeration AVIS_SOMMES_A_PAYER = new TypeReportEnumeration(9, \"Avis des sommes à payer\", JASPER_REPORT_AVIS);\n     public static final TypeReportEnumeration AVIS_SOMMES_A_PAYER_SANS_EXP = new TypeReportEnumeration(10, \"Avis des sommes à payer sans expéditeur\", JASPER_REPORT_AVIS);\n \n+    // --- AVIS MANDATEMENT\n+    private static final String JASPER_AVIS_MANDATEMENT_REPOSITORY = \"/jasper/avismandatement/\";\n+    private static final String[] JASPER_AVIS_MANDATEMENT_REPORTS = new String[] {\"avisMandatement.jrxml\"};\n+    private static final JasperReport JASPER_REPORT_AVIS_MANDATEMENT = getJasperReport(JASPER_AVIS_MANDATEMENT_REPOSITORY, JASPER_AVIS_MANDATEMENT_REPORTS);\n+    public static final TypeReportEnumeration AVIS_MANDATEMENT= new TypeReportEnumeration(9, \"Avis mandatement\", JASPER_REPORT_AVIS_MANDATEMENT);\n \n+    private JasperReport jasperReport;\n     public JasperReport getJasperReport() {\n         return jasperReport;\n     }\n","new_path":"@@ -34,7 +34,6 @@ public class TypeReportEnumeration extends EnumerationAbstract {\n     public static final TypeReportEnumeration TITRE_VOLET2 = new TypeReportEnumeration(6, \"Bordereau de titres Volet 2\", JASPER_REPORT_BORDEREAU_TITRE);\n     public static final TypeReportEnumeration TITRE_VOLET3 = new TypeReportEnumeration(7, \"Bordereau de titres Volet 3\", JASPER_REPORT_BORDEREAU_TITRE);\n     public static final TypeReportEnumeration TITRE = new TypeReportEnumeration(8, \"Bordereau de titres\", JASPER_REPORT_BORDEREAU_TITRE);\n-    private JasperReport jasperReport;\n \n \t// --- AVIS\n     private static final String JASPER_AVIS_REPOSITORY = \"/jasper/avis/\";\n@@ -44,7 +43,13 @@ public class TypeReportEnumeration extends EnumerationAbstract {\n     public static final TypeReportEnumeration AVIS_SOMMES_A_PAYER = new TypeReportEnumeration(9, \"Avis des sommes à payer\", JASPER_REPORT_AVIS);\n     public static final TypeReportEnumeration AVIS_SOMMES_A_PAYER_SANS_EXP = new TypeReportEnumeration(10, \"Avis des sommes à payer sans expéditeur\", JASPER_REPORT_AVIS);\n \n+    // --- AVIS MANDATEMENT\n+    private static final String JASPER_AVIS_MANDATEMENT_REPOSITORY = \"/jasper/avismandatement/\";\n+    private static final String[] JASPER_AVIS_MANDATEMENT_REPORTS = new String[] {\"avisMandatement.jrxml\"};\n+    private static final JasperReport JASPER_REPORT_AVIS_MANDATEMENT = getJasperReport(JASPER_AVIS_MANDATEMENT_REPOSITORY, JASPER_AVIS_MANDATEMENT_REPORTS);\n+    public static final TypeReportEnumeration AVIS_MANDATEMENT= new TypeReportEnumeration(9, \"Avis mandatement\", JASPER_REPORT_AVIS_MANDATEMENT);\n \n+    private JasperReport jasperReport;\n     public JasperReport getJasperReport() {\n         return jasperReport;\n     }\n","a_mode":"100644","old_path":"@@ -34,7 +34,6 @@ public class TypeReportEnumeration extends EnumerationAbstract {\n     public static final TypeReportEnumeration TITRE_VOLET2 = new TypeReportEnumeration(6, \"Bordereau de titres Volet 2\", JASPER_REPORT_BORDEREAU_TITRE);\n     public static final TypeReportEnumeration TITRE_VOLET3 = new TypeReportEnumeration(7, \"Bordereau de titres Volet 3\", JASPER_REPORT_BORDEREAU_TITRE);\n     public static final TypeReportEnumeration TITRE = new TypeReportEnumeration(8, \"Bordereau de titres\", JASPER_REPORT_BORDEREAU_TITRE);\n-    private JasperReport jasperReport;\n \n \t// --- AVIS\n     private static final String JASPER_AVIS_REPOSITORY = \"/jasper/avis/\";\n@@ -44,7 +43,13 @@ public class TypeReportEnumeration extends EnumerationAbstract {\n     public static final TypeReportEnumeration AVIS_SOMMES_A_PAYER = new TypeReportEnumeration(9, \"Avis des sommes à payer\", JASPER_REPORT_AVIS);\n     public static final TypeReportEnumeration AVIS_SOMMES_A_PAYER_SANS_EXP = new TypeReportEnumeration(10, \"Avis des sommes à payer sans expéditeur\", JASPER_REPORT_AVIS);\n \n+    // --- AVIS MANDATEMENT\n+    private static final String JASPER_AVIS_MANDATEMENT_REPOSITORY = \"/jasper/avismandatement/\";\n+    private static final String[] JASPER_AVIS_MANDATEMENT_REPORTS = new String[] {\"avisMandatement.jrxml\"};\n+    private static final JasperReport JASPER_REPORT_AVIS_MANDATEMENT = getJasperReport(JASPER_AVIS_MANDATEMENT_REPOSITORY, JASPER_AVIS_MANDATEMENT_REPORTS);\n+    public static final TypeReportEnumeration AVIS_MANDATEMENT= new TypeReportEnumeration(9, \"Avis mandatement\", JASPER_REPORT_AVIS_MANDATEMENT);\n \n+    private JasperReport jasperReport;\n     public JasperReport getJasperReport() {\n         return jasperReport;\n     }\n","new_file":false,"deleted_file":false,"renamed_file":false},{"b_mode":"100644","diff":"@@ -0,0 +1,7 @@\n+package fr.bl.avenir.gf.rest.ecompta.edition.service.avismandatement;\n+\n+import fr.bl.avenir.gf.rest.ecompta.edition.service.ServiceImprimer;\n+\n+public interface ServiceImprimerAvisMandatement extends ServiceImprimer {\n+\t\n+}\n","new_path":"@@ -0,0 +1,7 @@\n+package fr.bl.avenir.gf.rest.ecompta.edition.service.avismandatement;\n+\n+import fr.bl.avenir.gf.rest.ecompta.edition.service.ServiceImprimer;\n+\n+public interface ServiceImprimerAvisMandatement extends ServiceImprimer {\n+\t\n+}\n","a_mode":"0","old_path":"@@ -0,0 +1,7 @@\n+package fr.bl.avenir.gf.rest.ecompta.edition.service.avismandatement;\n+\n+import fr.bl.avenir.gf.rest.ecompta.edition.service.ServiceImprimer;\n+\n+public interface ServiceImprimerAvisMandatement extends ServiceImprimer {\n+\t\n+}\n","new_file":true,"deleted_file":false,"renamed_file":false},{"b_mode":"100644","diff":"@@ -0,0 +1,33 @@\n+package fr.bl.avenir.gf.rest.ecompta.edition.service.avismandatement.impl;\n+\n+import java.text.ParseException;\n+import java.util.List;\n+import java.util.Map;\n+\n+import org.springframework.stereotype.Service;\n+\n+import fr.bl.avenir.gf.rest.ecompta.edition.dto.avismandatement.DTOAvisMandatement;\n+import fr.bl.avenir.gf.rest.ecompta.edition.service.avismandatement.ServiceImprimerAvisMandatement;\n+import fr.bl.avenir.gf.rest.ecompta.edition.service.impl.ServiceImprimerImpl;\n+import fr.magnus.reftechnique.transverse.EntiteRelationnelle;\n+import fr.magnus.reftechnique.transverse.tableau.TableauAbstract;\n+\n+@Service(\"ServiceImprimerAvisMandatement\")\n+public class ServiceImprimerAvisMandatementImpl extends ServiceImprimerImpl<DTOAvisMandatement> implements ServiceImprimerAvisMandatement{\n+\n+    @Override\n+\tpublic List <DTOAvisMandatement> getListDonnee(TableauAbstract<EntiteRelationnelle>[] tableauEntiteRelationnelles, Map<String, Object> params) throws ParseException {\n+\n+        List<DTOAvisMandatement> dtoAvisMandatementList = null;\n+        \n+        if (tableauEntiteRelationnelles!= null && tableauEntiteRelationnelles.length == 2) {\n+            TableauAbstract<EntiteRelationnelle> tabDonnee = tableauEntiteRelationnelles[0];\n+//            Collections.sort(dtoAvisMandatementList, Comparator.comparing(DTOAvis::getBordereauNumero)\n+//                    .thenComparing(DTOAvis::getTitreNumeroPiece)\n+//                    .thenComparing(DTOAvis::getTiers1)\n+//                \t.thenComparing(DTOAvis::getImputationComplete));\n+        }\n+        return dtoAvisMandatementList;\t\t\n+\t}\n+\n+}\n","new_path":"@@ -0,0 +1,33 @@\n+package fr.bl.avenir.gf.rest.ecompta.edition.service.avismandatement.impl;\n+\n+import java.text.ParseException;\n+import java.util.List;\n+import java.util.Map;\n+\n+import org.springframework.stereotype.Service;\n+\n+import fr.bl.avenir.gf.rest.ecompta.edition.dto.avismandatement.DTOAvisMandatement;\n+import fr.bl.avenir.gf.rest.ecompta.edition.service.avismandatement.ServiceImprimerAvisMandatement;\n+import fr.bl.avenir.gf.rest.ecompta.edition.service.impl.ServiceImprimerImpl;\n+import fr.magnus.reftechnique.transverse.EntiteRelationnelle;\n+import fr.magnus.reftechnique.transverse.tableau.TableauAbstract;\n+\n+@Service(\"ServiceImprimerAvisMandatement\")\n+public class ServiceImprimerAvisMandatementImpl extends ServiceImprimerImpl<DTOAvisMandatement> implements ServiceImprimerAvisMandatement{\n+\n+    @Override\n+\tpublic List <DTOAvisMandatement> getListDonnee(TableauAbstract<EntiteRelationnelle>[] tableauEntiteRelationnelles, Map<String, Object> params) throws ParseException {\n+\n+        List<DTOAvisMandatement> dtoAvisMandatementList = null;\n+        \n+        if (tableauEntiteRelationnelles!= null && tableauEntiteRelationnelles.length == 2) {\n+            TableauAbstract<EntiteRelationnelle> tabDonnee = tableauEntiteRelationnelles[0];\n+//            Collections.sort(dtoAvisMandatementList, Comparator.comparing(DTOAvis::getBordereauNumero)\n+//                    .thenComparing(DTOAvis::getTitreNumeroPiece)\n+//                    .thenComparing(DTOAvis::getTiers1)\n+//                \t.thenComparing(DTOAvis::getImputationComplete));\n+        }\n+        return dtoAvisMandatementList;\t\t\n+\t}\n+\n+}\n","a_mode":"0","old_path":"@@ -0,0 +1,33 @@\n+package fr.bl.avenir.gf.rest.ecompta.edition.service.avismandatement.impl;\n+\n+import java.text.ParseException;\n+import java.util.List;\n+import java.util.Map;\n+\n+import org.springframework.stereotype.Service;\n+\n+import fr.bl.avenir.gf.rest.ecompta.edition.dto.avismandatement.DTOAvisMandatement;\n+import fr.bl.avenir.gf.rest.ecompta.edition.service.avismandatement.ServiceImprimerAvisMandatement;\n+import fr.bl.avenir.gf.rest.ecompta.edition.service.impl.ServiceImprimerImpl;\n+import fr.magnus.reftechnique.transverse.EntiteRelationnelle;\n+import fr.magnus.reftechnique.transverse.tableau.TableauAbstract;\n+\n+@Service(\"ServiceImprimerAvisMandatement\")\n+public class ServiceImprimerAvisMandatementImpl extends ServiceImprimerImpl<DTOAvisMandatement> implements ServiceImprimerAvisMandatement{\n+\n+    @Override\n+\tpublic List <DTOAvisMandatement> getListDonnee(TableauAbstract<EntiteRelationnelle>[] tableauEntiteRelationnelles, Map<String, Object> params) throws ParseException {\n+\n+        List<DTOAvisMandatement> dtoAvisMandatementList = null;\n+        \n+        if (tableauEntiteRelationnelles!= null && tableauEntiteRelationnelles.length == 2) {\n+            TableauAbstract<EntiteRelationnelle> tabDonnee = tableauEntiteRelationnelles[0];\n+//            Collections.sort(dtoAvisMandatementList, Comparator.comparing(DTOAvis::getBordereauNumero)\n+//                    .thenComparing(DTOAvis::getTitreNumeroPiece)\n+//                    .thenComparing(DTOAvis::getTiers1)\n+//                \t.thenComparing(DTOAvis::getImputationComplete));\n+        }\n+        return dtoAvisMandatementList;\t\t\n+\t}\n+\n+}\n","new_file":true,"deleted_file":false,"renamed_file":false},{"b_mode":"100644","diff":"@@ -1,8 +1,6 @@\n package fr.bl.avenir.gf.rest.ecompta.edition.service.impl;\n \n import java.math.BigDecimal;\n-import java.nio.file.Path;\n-import java.nio.file.Paths;\n import java.text.ParseException;\n import java.text.SimpleDateFormat;\n import java.util.ArrayList;\n@@ -58,14 +56,11 @@ public abstract class ServiceImprimerImpl<T> implements ServiceImprimer {\n         return getListDonnee(tableauEntiteRelationnelles, params);\n     }\n \n-    protected void mappingDtoEnvironnementFromJson(\n-            TableauAbstract<EntiteRelationnelle> environnement,\n-            Map<String, Object> params) {\n+    protected void mappingDtoEnvironnementFromJson(TableauAbstract<EntiteRelationnelle> environnement, Map<String, Object> params) {\n         if (environnement != null && environnement.getLigneCount() > 0) {\n             EntiteRelationnelle entiteRelationnelle = environnement.getDonnees().get(0);\n             params.putAll(entiteRelationnelle.getData());\n         }\n-\n     }\n \n     protected List<DTOOrdonnancement> mappingDtoOrdonnancementListFromJson(TableauAbstract<EntiteRelationnelle> ordonnancementJSon) {\n","new_path":"@@ -1,8 +1,6 @@\n package fr.bl.avenir.gf.rest.ecompta.edition.service.impl;\n \n import java.math.BigDecimal;\n-import java.nio.file.Path;\n-import java.nio.file.Paths;\n import java.text.ParseException;\n import java.text.SimpleDateFormat;\n import java.util.ArrayList;\n@@ -58,14 +56,11 @@ public abstract class ServiceImprimerImpl<T> implements ServiceImprimer {\n         return getListDonnee(tableauEntiteRelationnelles, params);\n     }\n \n-    protected void mappingDtoEnvironnementFromJson(\n-            TableauAbstract<EntiteRelationnelle> environnement,\n-            Map<String, Object> params) {\n+    protected void mappingDtoEnvironnementFromJson(TableauAbstract<EntiteRelationnelle> environnement, Map<String, Object> params) {\n         if (environnement != null && environnement.getLigneCount() > 0) {\n             EntiteRelationnelle entiteRelationnelle = environnement.getDonnees().get(0);\n             params.putAll(entiteRelationnelle.getData());\n         }\n-\n     }\n \n     protected List<DTOOrdonnancement> mappingDtoOrdonnancementListFromJson(TableauAbstract<EntiteRelationnelle> ordonnancementJSon) {\n","a_mode":"100644","old_path":"@@ -1,8 +1,6 @@\n package fr.bl.avenir.gf.rest.ecompta.edition.service.impl;\n \n import java.math.BigDecimal;\n-import java.nio.file.Path;\n-import java.nio.file.Paths;\n import java.text.ParseException;\n import java.text.SimpleDateFormat;\n import java.util.ArrayList;\n@@ -58,14 +56,11 @@ public abstract class ServiceImprimerImpl<T> implements ServiceImprimer {\n         return getListDonnee(tableauEntiteRelationnelles, params);\n     }\n \n-    protected void mappingDtoEnvironnementFromJson(\n-            TableauAbstract<EntiteRelationnelle> environnement,\n-            Map<String, Object> params) {\n+    protected void mappingDtoEnvironnementFromJson(TableauAbstract<EntiteRelationnelle> environnement, Map<String, Object> params) {\n         if (environnement != null && environnement.getLigneCount() > 0) {\n             EntiteRelationnelle entiteRelationnelle = environnement.getDonnees().get(0);\n             params.putAll(entiteRelationnelle.getData());\n         }\n-\n     }\n \n     protected List<DTOOrdonnancement> mappingDtoOrdonnancementListFromJson(TableauAbstract<EntiteRelationnelle> ordonnancementJSon) {\n","new_file":false,"deleted_file":false,"renamed_file":false},{"b_mode":"100644","diff":"@@ -0,0 +1,177 @@\n+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<!-- Created with Jaspersoft Studio version 6.20.6.final using JasperReports Library version 6.20.6-5c96b6aa8a39ac1dc6b6bea4b81168e16dd39231  -->\n+<jasperReport xmlns=\"http://jasperreports.sourceforge.net/jasperreports\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd\" name=\"avis Mandatement\" pageWidth=\"595\" pageHeight=\"842\" columnWidth=\"555\" leftMargin=\"20\" rightMargin=\"20\" topMargin=\"20\" bottomMargin=\"20\" uuid=\"927ed6bd-a20a-4be5-a0d3-40838bd4be33\">\n+\t<property name=\"com.jaspersoft.studio.report.description\" value=\"\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.pageHeight\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.pageWidth\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.topMargin\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.bottomMargin\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.leftMargin\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.rightMargin\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.columnWidth\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.columnSpacing\" value=\"pixel\"/>\n+\t<import value=\"org.apache.commons.codec.binary.Base64\"/>\n+\t<field name=\"collectiviteAdresse\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteAdresse]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteNom\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteNom]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteSignataire\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteSignataire]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteTampon\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteTampon]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteSignature\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteSignature]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteLogo\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteLogo]]></fieldDescription>\n+\t</field>\n+\t<field name=\"texteCourrier\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[texteCourrier]]></fieldDescription>\n+\t</field>\n+\t<field name=\"observation\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[observation]]></fieldDescription>\n+\t</field>\n+\t<field name=\"tiersNom\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[tiersNom]]></fieldDescription>\n+\t</field>\n+\t<field name=\"tiersAdresse\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[tiersAdresse]]></fieldDescription>\n+\t</field>\n+\t<field name=\"pieceJustificative\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[pieceJustificative]]></fieldDescription>\n+\t</field>\n+\t<field name=\"pieceJustificativePjIdUnique\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[pieceJustificativePjIdUnique]]></fieldDescription>\n+\t</field>\n+\t<field name=\"comptableAssignataire\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[comptableAssignataire]]></fieldDescription>\n+\t</field>\n+\t<field name=\"contexte\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[contexte]]></fieldDescription>\n+\t</field>\n+\t<variable name=\"dateImpression\" class=\"java.util.Date\">\n+\t\t<initialValueExpression><![CDATA[new java.util.Date()]]></initialValueExpression>\n+\t</variable>\n+\t<detail>\n+\t\t<band height=\"802\">\n+\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"10\" y=\"10\" width=\"71\" height=\"71\" uuid=\"aad91c31-50fe-4c2f-a40b-f388b886f650\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.width\" value=\"cm\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"cm\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteLogo}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField pattern=\"dd/MM/yyyy\">\n+\t\t\t\t<reportElement x=\"420\" y=\"10\" width=\"130\" height=\"20\" uuid=\"098fe04f-5f62-4cff-8ac1-19e1d8ced6f4\"/>\n+\t\t\t\t<textElement textAlignment=\"Right\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$V{dateImpression}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"10\" y=\"87\" width=\"232\" height=\"14\" uuid=\"51bb60de-b2d8-4d7b-ab36-4070601bfd28\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.y\" value=\"cm\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.width\" value=\"pixel\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteNom}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"10\" y=\"101\" width=\"232\" height=\"60\" uuid=\"1bbad5a7-a6b2-44c3-8d9d-9e54f96cc13a\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteAdresse}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"20\" y=\"219\" width=\"530\" height=\"14\" uuid=\"b6ba5b0c-97b9-4732-ba41-866e6adc16ff\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.y\" value=\"pixel\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textElement>\n+\t\t\t\t\t<font isBold=\"true\"/>\n+\t\t\t\t</textElement>\n+\t\t\t\t<textFieldExpression><![CDATA[\"Objet : avis de mandatement\"]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"10\" y=\"161\" width=\"232\" height=\"50\" uuid=\"bd980d8b-cb3e-4a9f-b206-36f6a1297937\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{contexte}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"284\" y=\"121\" width=\"266\" height=\"14\" uuid=\"8d5e39b4-e075-4a92-9f72-520d5d2fc2ed\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.y\" value=\"pixel\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.x\" value=\"pixel\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{tiersNom}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"284\" y=\"135\" width=\"266\" height=\"76\" uuid=\"2928046e-69ca-4cce-a5ff-18b0ff5a7382\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{tiersAdresse}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"120\" y=\"263\" width=\"100\" height=\"14\" uuid=\"617431e1-716f-4107-958c-77e2d2c6a578\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.y\" value=\"pixel\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.x\" value=\"pixel\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[\"Madame, Monsieur,\"]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"20\" y=\"300\" width=\"530\" height=\"47\" uuid=\"9e4143b6-aca8-46a0-8594-f1ee6a43f6dc\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"pixel\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{texteCourrier}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"10\" y=\"352\" width=\"540\" height=\"28\" uuid=\"8c85a3e6-ca74-4316-aa86-be17b7bbc432\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{pieceJustificative}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"20\" y=\"385\" width=\"530\" height=\"63\" uuid=\"22996012-07db-47fb-beb2-d38deaccf21d\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{pieceJustificativePjIdUnique}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<staticText>\n+\t\t\t\t<reportElement x=\"20\" y=\"466\" width=\"100\" height=\"14\" uuid=\"10b1d5c9-08e6-4f76-98c3-147301291ea5\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<text><![CDATA[Commentaires :]]></text>\n+\t\t\t</staticText>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"20\" y=\"486\" width=\"530\" height=\"164\" uuid=\"98d6f860-6ef3-42ec-b386-7239b746e90c\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{observation}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"297\" y=\"728\" width=\"141\" height=\"71\" uuid=\"13905277-b49f-45af-99b8-4e4e5ed8f144\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteSignature}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"447\" y=\"728\" width=\"102\" height=\"72\" uuid=\"b744c8ab-51dd-4415-a1e9-c3511c3893b2\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteTampon}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"11\" y=\"666\" width=\"538\" height=\"14\" uuid=\"e44f1cd3-5ed6-4b70-9154-61619c6bfe23\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[\"Ce mandat est payable par la trésorerie de \" + $F{comptableAssignataire}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"280\" y=\"709\" width=\"268\" height=\"14\" uuid=\"90e74a43-f976-4ba8-b3ac-7d321d394183\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[\"Le \" + $F{collectiviteSignataire}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<staticText>\n+\t\t\t\t<reportElement x=\"11\" y=\"685\" width=\"538\" height=\"14\" uuid=\"5e02f56d-8511-4b61-af39-6eedfb2d9930\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<text><![CDATA[Veu\" encoding=\"UTF-8\"?>\n+<!-- Created with Jaspersoft Studio version 6.20.6.final using JasperReports Library version 6.20.6-5c96b6aa8a39ac1dc6b6bea4b81168e16dd39231  -->\n+<jasperReport xmlns=\"http://jasperreports.sourceforge.net/jasperreports\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd\" name=\"avis Mandatement\" pageWidth=\"595\" pageHeight=\"842\" columnWidth=\"555\" leftMargin=\"20\" rightMargin=\"20\" topMargin=\"20\" bottomMargin=\"20\" uuid=\"927ed6bd-a20a-4be5-a0d3-40838bd4be33\">\n+\t<property name=\"com.jaspersoft.studio.report.description\" value=\"\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.pageHeight\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.pageWidth\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.topMargin\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.bottomMargin\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.leftMargin\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.rightMargin\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.columnWidth\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.columnSpacing\" value=\"pixel\"/>\n+\t<import value=\"org.apache.commons.codec.binary.Base64\"/>\n+\t<field name=\"collectiviteAdresse\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteAdresse]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteNom\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteNom]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteSignataire\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteSignataire]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteTampon\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteTampon]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteSignature\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteSignature]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteLogo\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteLogo]]></fieldDescription>\n+\t</field>\n+\t<field name=\"texteCourrier\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[texteCourrier]]></fieldDescription>\n+\t</field>\n+\t<field name=\"observation\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[observation]]></fieldDescription>\n+\t</field>\n+\t<field name=\"tiersNom\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[tiersNom]]></fieldDescription>\n+\t</field>\n+\t<field name=\"tiersAdresse\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[tiersAdresse]]></fieldDescription>\n+\t</field>\n+\t<field name=\"pieceJustificative\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[pieceJustificative]]></fieldDescription>\n+\t</field>\n+\t<field name=\"pieceJustificativePjIdUnique\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[pieceJustificativePjIdUnique]]></fieldDescription>\n+\t</field>\n+\t<field name=\"comptableAssignataire\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[comptableAssignataire]]></fieldDescription>\n+\t</field>\n+\t<field name=\"contexte\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[contexte]]></fieldDescription>\n+\t</field>\n+\t<variable name=\"dateImpression\" class=\"java.util.Date\">\n+\t\t<initialValueExpression><![CDATA[new java.util.Date()]]></initialValueExpression>\n+\t</variable>\n+\t<detail>\n+\t\t<band height=\"802\">\n+\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"10\" y=\"10\" width=\"71\" height=\"71\" uuid=\"aad91c31-50fe-4c2f-a40b-f388b886f650\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.width\" value=\"cm\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"cm\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteLogo}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField pattern=\"dd/MM/yyyy\">\n+\t\t\t\t<reportElement x=\"420\" y=\"10\" width=\"130\" height=\"20\" uuid=\"098fe04f-5f62-4cff-8ac1-19e1d8ced6f4\"/>\n+\t\t\t\t<textElement textAlignment=\"Right\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$V{dateImpression}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"10\" y=\"87\" width=\"232\" height=\"14\" uuid=\"51bb60de-b2d8-4d7b-ab36-4070601bfd28\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.y\" value=\"cm\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.width\" value=\"pixel\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteNom}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"10\" y=\"101\" width=\"232\" height=\"60\" uuid=\"1bbad5a7-a6b2-44c3-8d9d-9e54f96cc13a\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteAdresse}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"20\" y=\"219\" width=\"530\" height=\"14\" uuid=\"b6ba5b0c-97b9-4732-ba41-866e6adc16ff\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.y\" value=\"pixel\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textElement>\n+\t\t\t\t\t<font isBold=\"true\"/>\n+\t\t\t\t</textElement>\n+\t\t\t\t<textFieldExpression><![CDATA[\"Objet : avis de mandatement\"]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"10\" y=\"161\" width=\"232\" height=\"50\" uuid=\"bd980d8b-cb3e-4a9f-b206-36f6a1297937\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{contexte}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"284\" y=\"121\" width=\"266\" height=\"14\" uuid=\"8d5e39b4-e075-4a92-9f72-520d5d2fc2ed\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.y\" value=\"pixel\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.x\" value=\"pixel\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{tiersNom}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"284\" y=\"135\" width=\"266\" height=\"76\" uuid=\"2928046e-69ca-4cce-a5ff-18b0ff5a7382\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{tiersAdresse}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"120\" y=\"263\" width=\"100\" height=\"14\" uuid=\"617431e1-716f-4107-958c-77e2d2c6a578\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.y\" value=\"pixel\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.x\" value=\"pixel\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[\"Madame, Monsieur,\"]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"20\" y=\"300\" width=\"530\" height=\"47\" uuid=\"9e4143b6-aca8-46a0-8594-f1ee6a43f6dc\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"pixel\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{texteCourrier}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"10\" y=\"352\" width=\"540\" height=\"28\" uuid=\"8c85a3e6-ca74-4316-aa86-be17b7bbc432\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{pieceJustificative}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"20\" y=\"385\" width=\"530\" height=\"63\" uuid=\"22996012-07db-47fb-beb2-d38deaccf21d\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{pieceJustificativePjIdUnique}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<staticText>\n+\t\t\t\t<reportElement x=\"20\" y=\"466\" width=\"100\" height=\"14\" uuid=\"10b1d5c9-08e6-4f76-98c3-147301291ea5\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<text><![CDATA[Commentaires :]]></text>\n+\t\t\t</staticText>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"20\" y=\"486\" width=\"530\" height=\"164\" uuid=\"98d6f860-6ef3-42ec-b386-7239b746e90c\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{observation}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"297\" y=\"728\" width=\"141\" height=\"71\" uuid=\"13905277-b49f-45af-99b8-4e4e5ed8f144\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteSignature}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"447\" y=\"728\" width=\"102\" height=\"72\" uuid=\"b744c8ab-51dd-4415-a1e9-c3511c3893b2\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteTampon}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"11\" y=\"666\" width=\"538\" height=\"14\" uuid=\"e44f1cd3-5ed6-4b70-9154-61619c6bfe23\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[\"Ce mandat est payable par la trésorerie de \" + $F{comptableAssignataire}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"280\" y=\"709\" width=\"268\" height=\"14\" uuid=\"90e74a43-f976-4ba8-b3ac-7d321d394183\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[\"Le \" + $F{collectiviteSignataire}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<staticText>\n+\t\t\t\t<reportElement x=\"11\" y=\"685\" width=\"538\" height=\"14\" uuid=\"5e02f56d-8511-4b61-af39-6eedfb2d9930\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<text><![CDATA[Veuillez agréer, Monsieur, Madame, l''assurance de mes sentiments distingués.]]></text>\n+\t\t\t</staticText>\n+\t\t</band>\n+\t</detail>\n+</jasperReport>\n","a_mode":"0","old_path":"@@ -0,0 +1,177 @@\n+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<!-- Created with Jaspersoft Studio version 6.20.6.final using JasperReports Library version 6.20.6-5c96b6aa8a39ac1dc6b6bea4b81168e16dd39231  -->\n+<jasperReport xmlns=\"http://jasperreports.sourceforge.net/jasperreports\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd\" name=\"avis Mandatement\" pageWidth=\"595\" pageHeight=\"842\" columnWidth=\"555\" leftMargin=\"20\" rightMargin=\"20\" topMargin=\"20\" bottomMargin=\"20\" uuid=\"927ed6bd-a20a-4be5-a0d3-40838bd4be33\">\n+\t<property name=\"com.jaspersoft.studio.report.description\" value=\"\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.pageHeight\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.pageWidth\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.topMargin\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.bottomMargin\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.leftMargin\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.rightMargin\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.columnWidth\" value=\"pixel\"/>\n+\t<property name=\"com.jaspersoft.studio.unit.columnSpacing\" value=\"pixel\"/>\n+\t<import value=\"org.apache.commons.codec.binary.Base64\"/>\n+\t<field name=\"collectiviteAdresse\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteAdresse]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteNom\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteNom]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteSignataire\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteSignataire]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteTampon\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteTampon]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteSignature\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteSignature]]></fieldDescription>\n+\t</field>\n+\t<field name=\"collectiviteLogo\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[collectiviteLogo]]></fieldDescription>\n+\t</field>\n+\t<field name=\"texteCourrier\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[texteCourrier]]></fieldDescription>\n+\t</field>\n+\t<field name=\"observation\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[observation]]></fieldDescription>\n+\t</field>\n+\t<field name=\"tiersNom\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[tiersNom]]></fieldDescription>\n+\t</field>\n+\t<field name=\"tiersAdresse\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[tiersAdresse]]></fieldDescription>\n+\t</field>\n+\t<field name=\"pieceJustificative\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[pieceJustificative]]></fieldDescription>\n+\t</field>\n+\t<field name=\"pieceJustificativePjIdUnique\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[pieceJustificativePjIdUnique]]></fieldDescription>\n+\t</field>\n+\t<field name=\"comptableAssignataire\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[comptableAssignataire]]></fieldDescription>\n+\t</field>\n+\t<field name=\"contexte\" class=\"java.lang.String\">\n+\t\t<fieldDescription><![CDATA[contexte]]></fieldDescription>\n+\t</field>\n+\t<variable name=\"dateImpression\" class=\"java.util.Date\">\n+\t\t<initialValueExpression><![CDATA[new java.util.Date()]]></initialValueExpression>\n+\t</variable>\n+\t<detail>\n+\t\t<band height=\"802\">\n+\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"10\" y=\"10\" width=\"71\" height=\"71\" uuid=\"aad91c31-50fe-4c2f-a40b-f388b886f650\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.width\" value=\"cm\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"cm\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteLogo}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField pattern=\"dd/MM/yyyy\">\n+\t\t\t\t<reportElement x=\"420\" y=\"10\" width=\"130\" height=\"20\" uuid=\"098fe04f-5f62-4cff-8ac1-19e1d8ced6f4\"/>\n+\t\t\t\t<textElement textAlignment=\"Right\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$V{dateImpression}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"10\" y=\"87\" width=\"232\" height=\"14\" uuid=\"51bb60de-b2d8-4d7b-ab36-4070601bfd28\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.y\" value=\"cm\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.width\" value=\"pixel\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteNom}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"10\" y=\"101\" width=\"232\" height=\"60\" uuid=\"1bbad5a7-a6b2-44c3-8d9d-9e54f96cc13a\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteAdresse}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"20\" y=\"219\" width=\"530\" height=\"14\" uuid=\"b6ba5b0c-97b9-4732-ba41-866e6adc16ff\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.y\" value=\"pixel\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textElement>\n+\t\t\t\t\t<font isBold=\"true\"/>\n+\t\t\t\t</textElement>\n+\t\t\t\t<textFieldExpression><![CDATA[\"Objet : avis de mandatement\"]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"10\" y=\"161\" width=\"232\" height=\"50\" uuid=\"bd980d8b-cb3e-4a9f-b206-36f6a1297937\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{contexte}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"284\" y=\"121\" width=\"266\" height=\"14\" uuid=\"8d5e39b4-e075-4a92-9f72-520d5d2fc2ed\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.y\" value=\"pixel\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.x\" value=\"pixel\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{tiersNom}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"284\" y=\"135\" width=\"266\" height=\"76\" uuid=\"2928046e-69ca-4cce-a5ff-18b0ff5a7382\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{tiersAdresse}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"120\" y=\"263\" width=\"100\" height=\"14\" uuid=\"617431e1-716f-4107-958c-77e2d2c6a578\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.y\" value=\"pixel\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.x\" value=\"pixel\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[\"Madame, Monsieur,\"]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"20\" y=\"300\" width=\"530\" height=\"47\" uuid=\"9e4143b6-aca8-46a0-8594-f1ee6a43f6dc\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"pixel\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{texteCourrier}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"10\" y=\"352\" width=\"540\" height=\"28\" uuid=\"8c85a3e6-ca74-4316-aa86-be17b7bbc432\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{pieceJustificative}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"20\" y=\"385\" width=\"530\" height=\"63\" uuid=\"22996012-07db-47fb-beb2-d38deaccf21d\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{pieceJustificativePjIdUnique}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<staticText>\n+\t\t\t\t<reportElement x=\"20\" y=\"466\" width=\"100\" height=\"14\" uuid=\"10b1d5c9-08e6-4f76-98c3-147301291ea5\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<text><![CDATA[Commentaires :]]></text>\n+\t\t\t</staticText>\n+\t\t\t<textField textAdjust=\"ScaleFont\">\n+\t\t\t\t<reportElement x=\"20\" y=\"486\" width=\"530\" height=\"164\" uuid=\"98d6f860-6ef3-42ec-b386-7239b746e90c\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{observation}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"297\" y=\"728\" width=\"141\" height=\"71\" uuid=\"13905277-b49f-45af-99b8-4e4e5ed8f144\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteSignature}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"447\" y=\"728\" width=\"102\" height=\"72\" uuid=\"b744c8ab-51dd-4415-a1e9-c3511c3893b2\"/>\n+\t\t\t\t<textFieldExpression><![CDATA[$F{collectiviteTampon}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"11\" y=\"666\" width=\"538\" height=\"14\" uuid=\"e44f1cd3-5ed6-4b70-9154-61619c6bfe23\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[\"Ce mandat est payable par la trésorerie de \" + $F{comptableAssignataire}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<textField>\n+\t\t\t\t<reportElement x=\"280\" y=\"709\" width=\"268\" height=\"14\" uuid=\"90e74a43-f976-4ba8-b3ac-7d321d394183\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<textFieldExpression><![CDATA[\"Le \" + $F{collectiviteSignataire}]]></textFieldExpression>\n+\t\t\t</textField>\n+\t\t\t<staticText>\n+\t\t\t\t<reportElement x=\"11\" y=\"685\" width=\"538\" height=\"14\" uuid=\"5e02f56d-8511-4b61-af39-6eedfb2d9930\">\n+\t\t\t\t\t<property name=\"com.jaspersoft.studio.unit.height\" value=\"px\"/>\n+\t\t\t\t</reportElement>\n+\t\t\t\t<text><![CDATA[Veuillez agréer, Monsieur, Madame, l''assurance de mes sentiments distingués.]]></text>\n+\t\t\t</staticText>\n+\t\t</band>\n+\t</detail>\n+</jasperReport>\n","new_file":true,"deleted_file":false,"renamed_file":false}]'
 ]
@@ -60,10 +60,10 @@ GLPHModelImporterTest >> testParseDiffString [
 	self assert: diffRange changes size equals: 9.
 	self
 		assert:
-		(diffRange changes asMooseGroup allWithType: GLPHEDeletion) size
+		(diffRange changes asMooseGroup allWithType: GLHDeletion) size
 		equals: 2.
 	self
 		assert:
-		(diffRange changes asMooseGroup allWithType: GLPHEAddition) size
+		(diffRange changes asMooseGroup allWithType: GLHAddition) size
 		equals: 2
 ]