diff --git a/client/src/__tests__/components/GiftTemplate/templates/__snapshots__/MultipleChoice.test.tsx.snap b/client/src/__tests__/components/GiftTemplate/templates/__snapshots__/MultipleChoice.test.tsx.snap
index 189ede7..0a17bf6 100644
--- a/client/src/__tests__/components/GiftTemplate/templates/__snapshots__/MultipleChoice.test.tsx.snap
+++ b/client/src/__tests__/components/GiftTemplate/templates/__snapshots__/MultipleChoice.test.tsx.snap
@@ -64,7 +64,7 @@ exports[`MultipleChoice snapshot test 1`] = `
 " for="idmocked-id">
             Choice 1
             </label>
-          <svg style="
+          <svg data-testid="correct-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -88,7 +88,7 @@ exports[`MultipleChoice snapshot test 1`] = `
 " for="idmocked-id">
             Choice 2
             </label>
-          <svg style="
+          <svg data-testid="incorrect-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -180,7 +180,7 @@ exports[`MultipleChoice snapshot test with 2 images using markdown text format 1
             Choice 1
 
             </label>
-          <svg style="
+          <svg data-testid="correct-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -205,7 +205,7 @@ exports[`MultipleChoice snapshot test with 2 images using markdown text format 1
             Choice 2
 
             </label>
-          <svg style="
+          <svg data-testid="incorrect-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -229,7 +229,7 @@ exports[`MultipleChoice snapshot test with 2 images using markdown text format 1
 " for="idmocked-id">
             <img alt="Sample Image" src="https://via.placeholder.com/150">
             </label>
-          <svg style="
+          <svg data-testid="incorrect-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -321,7 +321,7 @@ exports[`MultipleChoice snapshot test with Moodle text format 1`] = `
 " for="idmocked-id">
             Choice 1
             </label>
-          <svg style="
+          <svg data-testid="correct-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -345,7 +345,7 @@ exports[`MultipleChoice snapshot test with Moodle text format 1`] = `
 " for="idmocked-id">
             Choice 2
             </label>
-          <svg style="
+          <svg data-testid="incorrect-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -436,7 +436,7 @@ exports[`MultipleChoice snapshot test with image 1`] = `
 " for="idmocked-id">
             Choice 1
             </label>
-          <svg style="
+          <svg data-testid="correct-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -460,7 +460,7 @@ exports[`MultipleChoice snapshot test with image 1`] = `
 " for="idmocked-id">
             Choice 2
             </label>
-          <svg style="
+          <svg data-testid="incorrect-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -484,7 +484,7 @@ exports[`MultipleChoice snapshot test with image 1`] = `
 " for="idmocked-id">
             <img alt="Sample Image" src="https://via.placeholder.com/150">
             </label>
-          <svg style="
+          <svg data-testid="incorrect-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -577,7 +577,7 @@ exports[`MultipleChoice snapshot test with image using markdown text format 1`]
             Choice 1
 
             </label>
-          <svg style="
+          <svg data-testid="correct-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -602,7 +602,7 @@ exports[`MultipleChoice snapshot test with image using markdown text format 1`]
             Choice 2
 
             </label>
-          <svg style="
+          <svg data-testid="incorrect-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -626,7 +626,7 @@ exports[`MultipleChoice snapshot test with image using markdown text format 1`]
 " for="idmocked-id">
             <img alt="Sample Image" src="https://via.placeholder.com/150">
             </label>
-          <svg style="
+          <svg data-testid="incorrect-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -718,7 +718,7 @@ exports[`MultipleChoice snapshot test with katex 1`] = `
 " for="idmocked-id">
             Choice 1
             </label>
-          <svg style="
+          <svg data-testid="correct-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -742,7 +742,7 @@ exports[`MultipleChoice snapshot test with katex 1`] = `
 " for="idmocked-id">
             Choice 2
             </label>
-          <svg style="
+          <svg data-testid="correct-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -833,7 +833,7 @@ exports[`MultipleChoice snapshot test with katex, using html text format 1`] = `
 " for="idmocked-id">
             Choice 1
             </label>
-          <svg style="
+          <svg data-testid="correct-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -857,7 +857,7 @@ exports[`MultipleChoice snapshot test with katex, using html text format 1`] = `
 " for="idmocked-id">
             Choice 2
             </label>
-          <svg style="
+          <svg data-testid="incorrect-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
diff --git a/client/src/__tests__/components/GiftTemplate/templates/__snapshots__/TrueFalse.test.tsx.snap b/client/src/__tests__/components/GiftTemplate/templates/__snapshots__/TrueFalse.test.tsx.snap
index 6ff0e9d..002da61 100644
--- a/client/src/__tests__/components/GiftTemplate/templates/__snapshots__/TrueFalse.test.tsx.snap
+++ b/client/src/__tests__/components/GiftTemplate/templates/__snapshots__/TrueFalse.test.tsx.snap
@@ -150,7 +150,7 @@ exports[`TrueFalse snapshot test with katex 1`] = `
 " for="idmocked-id">
             Vrai
             </label>
-          <svg style="
+          <svg data-testid="correct-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -174,7 +174,7 @@ exports[`TrueFalse snapshot test with katex 1`] = `
 " for="idmocked-id">
             Faux
             </label>
-          <svg style="
+          <svg data-testid="incorrect-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -265,7 +265,7 @@ exports[`TrueFalse snapshot test with moodle 1`] = `
 " for="idmocked-id">
             Vrai
             </label>
-          <svg style="
+          <svg data-testid="correct-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -289,7 +289,7 @@ exports[`TrueFalse snapshot test with moodle 1`] = `
 " for="idmocked-id">
             Faux
             </label>
-          <svg style="
+          <svg data-testid="incorrect-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -380,7 +380,7 @@ exports[`TrueFalse snapshot test with plain text 1`] = `
 " for="idmocked-id">
             Vrai
             </label>
-          <svg style="
+          <svg data-testid="correct-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;
@@ -404,7 +404,7 @@ exports[`TrueFalse snapshot test with plain text 1`] = `
 " for="idmocked-id">
             Faux
             </label>
-          <svg style="
+          <svg data-testid="incorrect-icon" style="
   vertical-align: text-bottom;
   display: inline-block;
   margin-left: 0.1rem;