diff --git a/src/components/DatePicker/__snapshots__/DatePicker.test.jsx.snap b/src/components/DatePicker/__snapshots__/DatePicker.test.jsx.snap
index 7738ea07..5ff9ec07 100644
--- a/src/components/DatePicker/__snapshots__/DatePicker.test.jsx.snap
+++ b/src/components/DatePicker/__snapshots__/DatePicker.test.jsx.snap
@@ -26,11 +26,11 @@ exports[`matches snapshot 1`] = `
         data-test="dhis2-uicore-box"
       >
         <div
-          class="jsx-3353877153 jsx-3173911271 input"
+          class="jsx-3353877153 jsx-31445346 input"
           data-test="dhis2-uicore-input"
         >
           <input
-            class="jsx-3353877153 jsx-3173911271 "
+            class="jsx-3353877153 jsx-31445346 "
             id="file"
             name="file"
             type="date"
diff --git a/src/components/ImportButtonStrip/__snapshots__/ImportButtonStrip.test.jsx.snap b/src/components/ImportButtonStrip/__snapshots__/ImportButtonStrip.test.jsx.snap
index 23dc99fd..1acc6c7a 100644
--- a/src/components/ImportButtonStrip/__snapshots__/ImportButtonStrip.test.jsx.snap
+++ b/src/components/ImportButtonStrip/__snapshots__/ImportButtonStrip.test.jsx.snap
@@ -7,14 +7,14 @@ exports[`matches snapshot 1`] = `
     data-test="import-strip"
   >
     <div
-      class="jsx-1994200789 start"
+      class="jsx-34417531 start"
       data-test="import-strip-button-strip"
     >
       <div
-        class="jsx-1994200789 box"
+        class="jsx-34417531 box"
       >
         <button
-          class="jsx-441677069 dryRun primary"
+          class="jsx-1796590446 dryRun primary"
           data-test="import-strip-dry-run-btn"
           type="submit"
         >
@@ -22,10 +22,10 @@ exports[`matches snapshot 1`] = `
         </button>
       </div>
       <div
-        class="jsx-1994200789 box"
+        class="jsx-34417531 box"
       >
         <button
-          class="jsx-441677069 secondary"
+          class="jsx-1796590446 secondary"
           data-test="import-strip-import-btn"
           type="submit"
         >
diff --git a/src/components/JobSummary/__test__/__snapshots__/Details.test.jsx.snap b/src/components/JobSummary/__test__/__snapshots__/Details.test.jsx.snap
index 50078c55..a9a7a026 100644
--- a/src/components/JobSummary/__test__/__snapshots__/Details.test.jsx.snap
+++ b/src/components/JobSummary/__test__/__snapshots__/Details.test.jsx.snap
@@ -23,13 +23,13 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerowhead"
         >
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             Key
           </th>
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             Value
@@ -44,13 +44,13 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             files
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             data1.json
@@ -61,13 +61,13 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             format
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             JSON
@@ -78,13 +78,13 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             dryRun
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             true
@@ -95,13 +95,13 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             strategy
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             New and updates
@@ -112,13 +112,13 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             preheatCache
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             true
@@ -129,13 +129,13 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             skipAudit
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             false
@@ -146,13 +146,13 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             dataElementIdScheme
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             Uid
@@ -163,13 +163,13 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             orgUnitIdScheme
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             Uid
@@ -180,13 +180,13 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             idScheme
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             Uid
@@ -197,13 +197,13 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             skipExistingCheck
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             false
@@ -214,13 +214,13 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             firstRowIsHeader
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             false
diff --git a/src/components/JobSummary/__test__/__snapshots__/JobSummary.test.jsx.snap b/src/components/JobSummary/__test__/__snapshots__/JobSummary.test.jsx.snap
index 7f91efaf..a48303ef 100644
--- a/src/components/JobSummary/__test__/__snapshots__/JobSummary.test.jsx.snap
+++ b/src/components/JobSummary/__test__/__snapshots__/JobSummary.test.jsx.snap
@@ -70,8 +70,9 @@ exports[`summary for a GML job matches snapshot 1`] = `
       </div>
     </div>
     <div
-      class="jsx-1555285825 jsx-876534464 "
+      class="jsx-742385706 jsx-3656744930 "
       data-test="dhis2-uicore-divider"
+      role="separator"
     />
     <div
       class="typeReportSummary"
@@ -100,31 +101,31 @@ exports[`summary for a GML job matches snapshot 1`] = `
                   data-test="dhis2-uicore-tablerowhead"
                 >
                   <th
-                    class="jsx-1796049005 "
+                    class="jsx-3181834369 "
                     data-test="dhis2-uicore-tablecellhead"
                   >
                     Created
                   </th>
                   <th
-                    class="jsx-1796049005 "
+                    class="jsx-3181834369 "
                     data-test="dhis2-uicore-tablecellhead"
                   >
                     Deleted
                   </th>
                   <th
-                    class="jsx-1796049005 "
+                    class="jsx-3181834369 "
                     data-test="dhis2-uicore-tablecellhead"
                   >
                     Ignored
                   </th>
                   <th
-                    class="jsx-1796049005 "
+                    class="jsx-3181834369 "
                     data-test="dhis2-uicore-tablecellhead"
                   >
                     Updated
                   </th>
                   <th
-                    class="jsx-1796049005 "
+                    class="jsx-3181834369 "
                     data-test="dhis2-uicore-tablecellhead"
                   >
                     Total
@@ -139,31 +140,31 @@ exports[`summary for a GML job matches snapshot 1`] = `
                   data-test="dhis2-uicore-tablerow"
                 >
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     0
                   </td>
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     0
                   </td>
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     0
                   </td>
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     0
                   </td>
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     0
@@ -194,37 +195,37 @@ exports[`summary for a GML job matches snapshot 1`] = `
                 data-test="dhis2-uicore-tablerowhead"
               >
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Type
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Created
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Deleted
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Ignored
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Updated
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Total
@@ -239,37 +240,37 @@ exports[`summary for a GML job matches snapshot 1`] = `
                 data-test="dhis2-uicore-tablerow"
               >
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   DefaultGmlImportService
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
@@ -299,25 +300,25 @@ exports[`summary for a GML job matches snapshot 1`] = `
                 data-test="dhis2-uicore-tablerowhead"
               >
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   UID
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Type
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Property
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Message
@@ -332,21 +333,21 @@ exports[`summary for a GML job matches snapshot 1`] = `
                 data-test="dhis2-uicore-tablerow"
               >
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 />
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   DefaultGmlImportService
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 />
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   Failed to validate job runtime - \`GML import failed: Content is not allowed in prolog. On line 1 column 1.\`
@@ -381,19 +382,19 @@ exports[`summary for a GML job matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerowhead"
             >
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Time
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Message
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 ID
@@ -408,20 +409,20 @@ exports[`summary for a GML job matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 2020-02-12 13:00:32
 
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 Failed to validate job runtime - \`GML import failed: Content is not allowed in prolog. On line 1 column 1.\`
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 init
@@ -455,13 +456,13 @@ exports[`summary for a GML job matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerowhead"
             >
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Key
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Value
@@ -476,13 +477,13 @@ exports[`summary for a GML job matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 files
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 gml1.gml
@@ -493,13 +494,13 @@ exports[`summary for a GML job matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 dryRun
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 true
@@ -583,8 +584,9 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
       </div>
     </div>
     <div
-      class="jsx-1555285825 jsx-876534464 "
+      class="jsx-742385706 jsx-3656744930 "
       data-test="dhis2-uicore-divider"
+      role="separator"
     />
     <div
       class="container"
@@ -612,13 +614,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
                 data-test="dhis2-uicore-tablerowhead"
               >
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Status
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Description
@@ -633,13 +635,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
                 data-test="dhis2-uicore-tablerow"
               >
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   WARNING
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   Import process completed successfully
@@ -659,31 +661,31 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
                 data-test="dhis2-uicore-tablerowhead"
               >
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Created
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Deleted
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Ignored
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Updated
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Total
@@ -698,31 +700,31 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
                 data-test="dhis2-uicore-tablerow"
               >
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   173
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   173
@@ -752,13 +754,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
                 data-test="dhis2-uicore-tablerowhead"
               >
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Object
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Value
@@ -773,13 +775,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
                 data-test="dhis2-uicore-tablerow"
               >
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   V6L425pT3A0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   Category option combo not found or not accessible for writing data
@@ -790,13 +792,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
                 data-test="dhis2-uicore-tablerow"
               >
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   Prlt0C1RF0s
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   Category option combo not found or not accessible for writing data
@@ -807,13 +809,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
                 data-test="dhis2-uicore-tablerow"
               >
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   hEFKSsPV5et
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   Category option combo not found or not accessible for writing data
@@ -824,13 +826,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
                 data-test="dhis2-uicore-tablerow"
               >
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   psbwp3CQEhs
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   Category option combo not found or not accessible for writing data
@@ -869,19 +871,19 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerowhead"
             >
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Time
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Message
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 ID
@@ -896,20 +898,20 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 2020-02-12 12:00:58
 
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 Initiated dataValueImport
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 init
@@ -920,20 +922,20 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 2020-02-12 12:00:59
 
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 Process started
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 oE17j9gw54i
@@ -944,20 +946,20 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 2020-02-12 12:00:59
 
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 Importing data values
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 SKEyN7hdwyd
@@ -968,20 +970,20 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 2020-02-12 12:00:59
 
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 Import done
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 CO2RDYqaGde
@@ -1015,13 +1017,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerowhead"
             >
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Key
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Value
@@ -1036,13 +1038,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 files
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 data2.json
@@ -1053,13 +1055,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 format
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 JSON
@@ -1070,13 +1072,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 dryRun
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 true
@@ -1087,13 +1089,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 strategy
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 Updates only
@@ -1104,13 +1106,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 preheatCache
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 false
@@ -1121,13 +1123,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 skipAudit
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 false
@@ -1138,13 +1140,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 dataElementIdScheme
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 Uid
@@ -1155,13 +1157,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 orgUnitIdScheme
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 Uid
@@ -1172,13 +1174,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 idScheme
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 Uid
@@ -1189,13 +1191,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 skipExistingCheck
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 true
@@ -1206,13 +1208,13 @@ exports[`summary for a data import job with conflicts matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 firstRowIsHeader
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 false
diff --git a/src/components/JobSummary/__test__/__snapshots__/Log.test.jsx.snap b/src/components/JobSummary/__test__/__snapshots__/Log.test.jsx.snap
index 53f20926..f31e36a4 100644
--- a/src/components/JobSummary/__test__/__snapshots__/Log.test.jsx.snap
+++ b/src/components/JobSummary/__test__/__snapshots__/Log.test.jsx.snap
@@ -23,19 +23,19 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerowhead"
         >
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             Time
           </th>
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             Message
           </th>
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             ID
@@ -50,20 +50,20 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             2020-01-01 00:00:00
 
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             First day of year
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             Jan
@@ -74,20 +74,20 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             2020-01-02 00:00:00
 
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             Snd day of year
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             Jan2
@@ -98,20 +98,20 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             2020-12-31 00:00:00
 
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             Last day of year
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             Dec
diff --git a/src/components/JobSummary/__test__/__snapshots__/Messages.test.jsx.snap b/src/components/JobSummary/__test__/__snapshots__/Messages.test.jsx.snap
index 8c9acb19..5afbc450 100644
--- a/src/components/JobSummary/__test__/__snapshots__/Messages.test.jsx.snap
+++ b/src/components/JobSummary/__test__/__snapshots__/Messages.test.jsx.snap
@@ -23,25 +23,25 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerowhead"
         >
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             UID
           </th>
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             Type
           </th>
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             Property
           </th>
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             Message
@@ -56,25 +56,25 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             abc
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             DefaultGmlImportService
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             def
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             message one
@@ -85,25 +85,25 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             xyz
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             SndGmlImportService
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             def
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             message one
diff --git a/src/components/JobSummary/__test__/__snapshots__/SingleStatusTable.test.jsx.snap b/src/components/JobSummary/__test__/__snapshots__/SingleStatusTable.test.jsx.snap
index f6bed94c..56c3c0ff 100644
--- a/src/components/JobSummary/__test__/__snapshots__/SingleStatusTable.test.jsx.snap
+++ b/src/components/JobSummary/__test__/__snapshots__/SingleStatusTable.test.jsx.snap
@@ -14,13 +14,13 @@ exports[`matches snapshot 1`] = `
         data-test="dhis2-uicore-tablerowhead"
       >
         <th
-          class="jsx-1796049005 "
+          class="jsx-3181834369 "
           data-test="dhis2-uicore-tablecellhead"
         >
           Status
         </th>
         <th
-          class="jsx-1796049005 "
+          class="jsx-3181834369 "
           data-test="dhis2-uicore-tablecellhead"
         >
           Description
@@ -35,13 +35,13 @@ exports[`matches snapshot 1`] = `
         data-test="dhis2-uicore-tablerow"
       >
         <td
-          class="jsx-996330601 "
+          class="jsx-2229340108 "
           data-test="dhis2-uicore-tablecell"
         >
           WARNING
         </td>
         <td
-          class="jsx-996330601 "
+          class="jsx-2229340108 "
           data-test="dhis2-uicore-tablecell"
         >
           Import process completed successfully
diff --git a/src/components/JobSummary/__test__/__snapshots__/SingleSummary.test.jsx.snap b/src/components/JobSummary/__test__/__snapshots__/SingleSummary.test.jsx.snap
index f145f151..94550fb8 100644
--- a/src/components/JobSummary/__test__/__snapshots__/SingleSummary.test.jsx.snap
+++ b/src/components/JobSummary/__test__/__snapshots__/SingleSummary.test.jsx.snap
@@ -24,13 +24,13 @@ exports[`matches snapshot 1`] = `
             data-test="dhis2-uicore-tablerowhead"
           >
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Status
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Description
@@ -45,13 +45,13 @@ exports[`matches snapshot 1`] = `
             data-test="dhis2-uicore-tablerow"
           >
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               WARNING
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               Import process completed successfully
@@ -71,31 +71,31 @@ exports[`matches snapshot 1`] = `
             data-test="dhis2-uicore-tablerowhead"
           >
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Created
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Deleted
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Ignored
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Updated
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Total
@@ -110,31 +110,31 @@ exports[`matches snapshot 1`] = `
             data-test="dhis2-uicore-tablerow"
           >
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               1
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               2
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               3
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               4
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               10
@@ -164,13 +164,13 @@ exports[`matches snapshot 1`] = `
             data-test="dhis2-uicore-tablerowhead"
           >
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Object
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Value
@@ -185,13 +185,13 @@ exports[`matches snapshot 1`] = `
             data-test="dhis2-uicore-tablerow"
           >
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               a
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               conflict a value
@@ -202,13 +202,13 @@ exports[`matches snapshot 1`] = `
             data-test="dhis2-uicore-tablerow"
           >
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               b
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               conflict b value
diff --git a/src/components/JobSummary/__test__/__snapshots__/Summary.test.jsx.snap b/src/components/JobSummary/__test__/__snapshots__/Summary.test.jsx.snap
index 92bad399..10d5774b 100644
--- a/src/components/JobSummary/__test__/__snapshots__/Summary.test.jsx.snap
+++ b/src/components/JobSummary/__test__/__snapshots__/Summary.test.jsx.snap
@@ -28,13 +28,13 @@ exports[`different job type summaries matches snapshot - DATAVALUE_IMPORT 1`] =
               data-test="dhis2-uicore-tablerowhead"
             >
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Status
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Description
@@ -49,13 +49,13 @@ exports[`different job type summaries matches snapshot - DATAVALUE_IMPORT 1`] =
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 SUCCESS
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 Import process completed successfully
@@ -75,31 +75,31 @@ exports[`different job type summaries matches snapshot - DATAVALUE_IMPORT 1`] =
               data-test="dhis2-uicore-tablerowhead"
             >
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Created
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Deleted
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Ignored
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Updated
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Total
@@ -114,31 +114,31 @@ exports[`different job type summaries matches snapshot - DATAVALUE_IMPORT 1`] =
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
@@ -184,31 +184,31 @@ exports[`different job type summaries matches snapshot - EVENT_IMPORT 1`] = `
               data-test="dhis2-uicore-tablerowhead"
             >
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Created
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Deleted
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Ignored
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Updated
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Total
@@ -223,31 +223,31 @@ exports[`different job type summaries matches snapshot - EVENT_IMPORT 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 1
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 1
@@ -283,13 +283,13 @@ exports[`different job type summaries matches snapshot - EVENT_IMPORT 1`] = `
                 data-test="dhis2-uicore-tablerowhead"
               >
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Status
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Description
@@ -304,13 +304,13 @@ exports[`different job type summaries matches snapshot - EVENT_IMPORT 1`] = `
                 data-test="dhis2-uicore-tablerow"
               >
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   ERROR
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   Event date is required. 
@@ -330,31 +330,31 @@ exports[`different job type summaries matches snapshot - EVENT_IMPORT 1`] = `
                 data-test="dhis2-uicore-tablerowhead"
               >
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Created
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Deleted
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Ignored
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Updated
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Total
@@ -369,31 +369,31 @@ exports[`different job type summaries matches snapshot - EVENT_IMPORT 1`] = `
                 data-test="dhis2-uicore-tablerow"
               >
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   1
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   1
@@ -437,31 +437,31 @@ exports[`different job type summaries matches snapshot - GML_IMPORT 1`] = `
                 data-test="dhis2-uicore-tablerowhead"
               >
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Created
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Deleted
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Ignored
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Updated
                 </th>
                 <th
-                  class="jsx-1796049005 "
+                  class="jsx-3181834369 "
                   data-test="dhis2-uicore-tablecellhead"
                 >
                   Total
@@ -476,31 +476,31 @@ exports[`different job type summaries matches snapshot - GML_IMPORT 1`] = `
                 data-test="dhis2-uicore-tablerow"
               >
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
                 </td>
                 <td
-                  class="jsx-996330601 "
+                  class="jsx-2229340108 "
                   data-test="dhis2-uicore-tablecell"
                 >
                   0
@@ -531,37 +531,37 @@ exports[`different job type summaries matches snapshot - GML_IMPORT 1`] = `
               data-test="dhis2-uicore-tablerowhead"
             >
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Type
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Created
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Deleted
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Ignored
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Updated
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Total
@@ -576,37 +576,37 @@ exports[`different job type summaries matches snapshot - GML_IMPORT 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 DefaultGmlImportService
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
@@ -636,25 +636,25 @@ exports[`different job type summaries matches snapshot - GML_IMPORT 1`] = `
               data-test="dhis2-uicore-tablerowhead"
             >
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 UID
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Type
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Property
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Message
@@ -669,21 +669,21 @@ exports[`different job type summaries matches snapshot - GML_IMPORT 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               />
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 DefaultGmlImportService
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               />
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 Failed to validate job runtime - \`GML import failed: Content is not allowed in prolog. On line 1 column 1.\`
@@ -725,31 +725,31 @@ exports[`different job type summaries matches snapshot - METADATA_IMPORT 1`] = `
               data-test="dhis2-uicore-tablerowhead"
             >
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Created
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Deleted
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Ignored
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Updated
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Total
@@ -764,31 +764,31 @@ exports[`different job type summaries matches snapshot - METADATA_IMPORT 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 0
diff --git a/src/components/JobSummary/__test__/__snapshots__/TypeCount.test.jsx.snap b/src/components/JobSummary/__test__/__snapshots__/TypeCount.test.jsx.snap
index 010f2fa5..a4434a88 100644
--- a/src/components/JobSummary/__test__/__snapshots__/TypeCount.test.jsx.snap
+++ b/src/components/JobSummary/__test__/__snapshots__/TypeCount.test.jsx.snap
@@ -23,37 +23,37 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerowhead"
         >
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             Type
           </th>
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             Created
           </th>
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             Deleted
           </th>
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             Ignored
           </th>
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             Updated
           </th>
           <th
-            class="jsx-1796049005 "
+            class="jsx-3181834369 "
             data-test="dhis2-uicore-tablecellhead"
           >
             Total
@@ -68,37 +68,37 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             DefaultGmlImportService
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             1
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             2
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             3
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             4
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             10
@@ -109,37 +109,37 @@ exports[`matches snapshot 1`] = `
           data-test="dhis2-uicore-tablerow"
         >
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             SndGmlImportService
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             1
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             2
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             3
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             4
           </td>
           <td
-            class="jsx-996330601 "
+            class="jsx-2229340108 "
             data-test="dhis2-uicore-tablecell"
           >
             10
diff --git a/src/components/JobSummary/__test__/__snapshots__/TypeReportSummary.test.jsx.snap b/src/components/JobSummary/__test__/__snapshots__/TypeReportSummary.test.jsx.snap
index 489d6447..72e3851f 100644
--- a/src/components/JobSummary/__test__/__snapshots__/TypeReportSummary.test.jsx.snap
+++ b/src/components/JobSummary/__test__/__snapshots__/TypeReportSummary.test.jsx.snap
@@ -25,31 +25,31 @@ exports[`matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerowhead"
             >
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Created
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Deleted
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Ignored
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Updated
               </th>
               <th
-                class="jsx-1796049005 "
+                class="jsx-3181834369 "
                 data-test="dhis2-uicore-tablecellhead"
               >
                 Total
@@ -64,31 +64,31 @@ exports[`matches snapshot 1`] = `
               data-test="dhis2-uicore-tablerow"
             >
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 1
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 2
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 3
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 4
               </td>
               <td
-                class="jsx-996330601 "
+                class="jsx-2229340108 "
                 data-test="dhis2-uicore-tablecell"
               >
                 10
@@ -119,37 +119,37 @@ exports[`matches snapshot 1`] = `
             data-test="dhis2-uicore-tablerowhead"
           >
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Type
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Created
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Deleted
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Ignored
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Updated
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Total
@@ -164,37 +164,37 @@ exports[`matches snapshot 1`] = `
             data-test="dhis2-uicore-tablerow"
           >
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               DefaultGmlImportService
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               1
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               2
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               3
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               4
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               10
@@ -205,37 +205,37 @@ exports[`matches snapshot 1`] = `
             data-test="dhis2-uicore-tablerow"
           >
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               SndGmlImportService
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               1
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               2
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               3
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               4
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               10
@@ -265,25 +265,25 @@ exports[`matches snapshot 1`] = `
             data-test="dhis2-uicore-tablerowhead"
           >
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               UID
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Type
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Property
             </th>
             <th
-              class="jsx-1796049005 "
+              class="jsx-3181834369 "
               data-test="dhis2-uicore-tablecellhead"
             >
               Message
@@ -298,25 +298,25 @@ exports[`matches snapshot 1`] = `
             data-test="dhis2-uicore-tablerow"
           >
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               abc
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               DefaultGmlImportService
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               def
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               message one
@@ -327,25 +327,25 @@ exports[`matches snapshot 1`] = `
             data-test="dhis2-uicore-tablerow"
           >
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               xyz
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               SndGmlImportService
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               def
             </td>
             <td
-              class="jsx-996330601 "
+              class="jsx-2229340108 "
               data-test="dhis2-uicore-tablecell"
             >
               message one
diff --git a/src/components/MoreOptions/__snapshots__/MoreOptions.test.jsx.snap b/src/components/MoreOptions/__snapshots__/MoreOptions.test.jsx.snap
index 3b361cfa..af4bcdd9 100644
--- a/src/components/MoreOptions/__snapshots__/MoreOptions.test.jsx.snap
+++ b/src/components/MoreOptions/__snapshots__/MoreOptions.test.jsx.snap
@@ -71,8 +71,9 @@ exports[`matches snapshot when toggled 1`] = `
       </h2>
     </header>
     <div
-      class="jsx-1555285825 jsx-876534464 "
+      class="jsx-742385706 jsx-3656744930 "
       data-test="dhis2-uicore-divider"
+      role="separator"
     />
     <div
       class="children"
@@ -118,8 +119,9 @@ exports[`matches snapshot when toggled and different label 1`] = `
       </h2>
     </header>
     <div
-      class="jsx-1555285825 jsx-876534464 "
+      class="jsx-742385706 jsx-3656744930 "
       data-test="dhis2-uicore-divider"
+      role="separator"
     />
     <div
       class="children"
diff --git a/src/components/Page/__snapshots__/Page.test.jsx.snap b/src/components/Page/__snapshots__/Page.test.jsx.snap
index ee54ecea..1da8c4f5 100644
--- a/src/components/Page/__snapshots__/Page.test.jsx.snap
+++ b/src/components/Page/__snapshots__/Page.test.jsx.snap
@@ -92,6 +92,7 @@ exports[`matches snapshot when loading(number) and no summary task 1`] = `
               class="jsx-498096601 center-inner-content"
             >
               <div
+                aria-valuenow="50"
                 class="jsx-3127531794 jsx-1918124637 "
                 data-test="dhis2-uicore-linearloader"
                 role="progressbar"
@@ -193,8 +194,9 @@ exports[`matches snapshot when not loading and a full summary task 1`] = `
           </div>
         </div>
         <div
-          class="jsx-1555285825 jsx-876534464 "
+          class="jsx-742385706 jsx-3656744930 "
           data-test="dhis2-uicore-divider"
+          role="separator"
         />
         <div
           class="container"
@@ -222,13 +224,13 @@ exports[`matches snapshot when not loading and a full summary task 1`] = `
                     data-test="dhis2-uicore-tablerowhead"
                   >
                     <th
-                      class="jsx-1796049005 "
+                      class="jsx-3181834369 "
                       data-test="dhis2-uicore-tablecellhead"
                     >
                       Status
                     </th>
                     <th
-                      class="jsx-1796049005 "
+                      class="jsx-3181834369 "
                       data-test="dhis2-uicore-tablecellhead"
                     >
                       Description
@@ -243,13 +245,13 @@ exports[`matches snapshot when not loading and a full summary task 1`] = `
                     data-test="dhis2-uicore-tablerow"
                   >
                     <td
-                      class="jsx-996330601 "
+                      class="jsx-2229340108 "
                       data-test="dhis2-uicore-tablecell"
                     >
                       SUCCESS
                     </td>
                     <td
-                      class="jsx-996330601 "
+                      class="jsx-2229340108 "
                       data-test="dhis2-uicore-tablecell"
                     >
                       Import process completed successfully
@@ -269,31 +271,31 @@ exports[`matches snapshot when not loading and a full summary task 1`] = `
                     data-test="dhis2-uicore-tablerowhead"
                   >
                     <th
-                      class="jsx-1796049005 "
+                      class="jsx-3181834369 "
                       data-test="dhis2-uicore-tablecellhead"
                     >
                       Created
                     </th>
                     <th
-                      class="jsx-1796049005 "
+                      class="jsx-3181834369 "
                       data-test="dhis2-uicore-tablecellhead"
                     >
                       Deleted
                     </th>
                     <th
-                      class="jsx-1796049005 "
+                      class="jsx-3181834369 "
                       data-test="dhis2-uicore-tablecellhead"
                     >
                       Ignored
                     </th>
                     <th
-                      class="jsx-1796049005 "
+                      class="jsx-3181834369 "
                       data-test="dhis2-uicore-tablecellhead"
                     >
                       Updated
                     </th>
                     <th
-                      class="jsx-1796049005 "
+                      class="jsx-3181834369 "
                       data-test="dhis2-uicore-tablecellhead"
                     >
                       Total
@@ -308,31 +310,31 @@ exports[`matches snapshot when not loading and a full summary task 1`] = `
                     data-test="dhis2-uicore-tablerow"
                   >
                     <td
-                      class="jsx-996330601 "
+                      class="jsx-2229340108 "
                       data-test="dhis2-uicore-tablecell"
                     >
                       0
                     </td>
                     <td
-                      class="jsx-996330601 "
+                      class="jsx-2229340108 "
                       data-test="dhis2-uicore-tablecell"
                     >
                       0
                     </td>
                     <td
-                      class="jsx-996330601 "
+                      class="jsx-2229340108 "
                       data-test="dhis2-uicore-tablecell"
                     >
                       0
                     </td>
                     <td
-                      class="jsx-996330601 "
+                      class="jsx-2229340108 "
                       data-test="dhis2-uicore-tablecell"
                     >
                       0
                     </td>
                     <td
-                      class="jsx-996330601 "
+                      class="jsx-2229340108 "
                       data-test="dhis2-uicore-tablecell"
                     >
                       0
@@ -371,19 +373,19 @@ exports[`matches snapshot when not loading and a full summary task 1`] = `
                   data-test="dhis2-uicore-tablerowhead"
                 >
                   <th
-                    class="jsx-1796049005 "
+                    class="jsx-3181834369 "
                     data-test="dhis2-uicore-tablecellhead"
                   >
                     Time
                   </th>
                   <th
-                    class="jsx-1796049005 "
+                    class="jsx-3181834369 "
                     data-test="dhis2-uicore-tablecellhead"
                   >
                     Message
                   </th>
                   <th
-                    class="jsx-1796049005 "
+                    class="jsx-3181834369 "
                     data-test="dhis2-uicore-tablecellhead"
                   >
                     ID
@@ -398,20 +400,20 @@ exports[`matches snapshot when not loading and a full summary task 1`] = `
                   data-test="dhis2-uicore-tablerow"
                 >
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     2020-02-12 12:00:23
 
                   </td>
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     Initiated dataValueImport
                   </td>
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     init
@@ -422,20 +424,20 @@ exports[`matches snapshot when not loading and a full summary task 1`] = `
                   data-test="dhis2-uicore-tablerow"
                 >
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     2020-02-12 12:00:23
 
                   </td>
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     Process started
                   </td>
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     LPCnEwppbqy
@@ -446,20 +448,20 @@ exports[`matches snapshot when not loading and a full summary task 1`] = `
                   data-test="dhis2-uicore-tablerow"
                 >
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     2020-02-12 12:00:23
 
                   </td>
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     Importing data values
                   </td>
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     quL1PHwVPg1
@@ -470,20 +472,20 @@ exports[`matches snapshot when not loading and a full summary task 1`] = `
                   data-test="dhis2-uicore-tablerow"
                 >
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     2020-02-12 12:00:23
 
                   </td>
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     Import done
                   </td>
                   <td
-                    class="jsx-996330601 "
+                    class="jsx-2229340108 "
                     data-test="dhis2-uicore-tablecell"
                   >
                     fn5gnxqYk1J
diff --git a/src/components/RadioGroup/__snapshots__/RadioGroup.test.jsx.snap b/src/components/RadioGroup/__snapshots__/RadioGroup.test.jsx.snap
index 3e4e80a9..228baeb1 100644
--- a/src/components/RadioGroup/__snapshots__/RadioGroup.test.jsx.snap
+++ b/src/components/RadioGroup/__snapshots__/RadioGroup.test.jsx.snap
@@ -16,18 +16,18 @@ exports[`matches snapshot 1`] = `
     >
       <div>
         <label
-          class="jsx-3878022568 "
+          class="jsx-2199927085 "
           data-test="radio-group-format-a"
         >
           <input
             checked=""
-            class="jsx-3878022568"
+            class="jsx-2199927085"
             name="format"
             type="radio"
             value="a"
           />
           <div
-            class="jsx-3878022568 icon"
+            class="jsx-2199927085 icon"
           >
             <svg
               class="jsx-1260643562 jsx-1120332023 checked"
@@ -61,17 +61,17 @@ exports[`matches snapshot 1`] = `
       </div>
       <div>
         <label
-          class="jsx-3878022568 "
+          class="jsx-2199927085 "
           data-test="radio-group-format-b"
         >
           <input
-            class="jsx-3878022568"
+            class="jsx-2199927085"
             name="format"
             type="radio"
             value="b"
           />
           <div
-            class="jsx-3878022568 icon"
+            class="jsx-2199927085 icon"
           >
             <svg
               class="jsx-1260643562 jsx-1120332023 "
@@ -105,17 +105,17 @@ exports[`matches snapshot 1`] = `
       </div>
       <div>
         <label
-          class="jsx-3878022568 "
+          class="jsx-2199927085 "
           data-test="radio-group-format-c"
         >
           <input
-            class="jsx-3878022568"
+            class="jsx-2199927085"
             name="format"
             type="radio"
             value="c"
           />
           <div
-            class="jsx-3878022568 icon"
+            class="jsx-2199927085 icon"
           >
             <svg
               class="jsx-1260643562 jsx-1120332023 "
diff --git a/src/components/Select/__snapshots__/Select.test.jsx.snap b/src/components/Select/__snapshots__/Select.test.jsx.snap
index 64a0e223..3ffde242 100644
--- a/src/components/Select/__snapshots__/Select.test.jsx.snap
+++ b/src/components/Select/__snapshots__/Select.test.jsx.snap
@@ -38,19 +38,19 @@ exports[`matches snapshot 1`] = `
                   data-test="dhis2-uicore-select"
                 >
                   <div
-                    class="jsx-1462515063 root"
+                    class="jsx-3974936783 root"
                     data-test="dhis2-uicore-select-input"
                     tabindex="0"
                   >
                     <div
-                      class="jsx-1462515063 root-children"
+                      class="jsx-3974936783 root-children"
                     >
                       <div
-                        class="jsx-2240447017 jsx-4123978364 root"
+                        class="jsx-2256910823 jsx-4123978364 root"
                       />
                     </div>
                     <div
-                      class="jsx-1462515063 root-right"
+                      class="jsx-3974936783 root-right"
                     >
                       <svg
                         height="16"