diff --git a/src/components/DimensionsPanel/List/__tests__/__snapshots__/DimensionItem.spec.js.snap b/src/components/DimensionsPanel/List/__tests__/__snapshots__/DimensionItem.spec.js.snap
index f58b07faa..dc5be2f59 100644
--- a/src/components/DimensionsPanel/List/__tests__/__snapshots__/DimensionItem.spec.js.snap
+++ b/src/components/DimensionsPanel/List/__tests__/__snapshots__/DimensionItem.spec.js.snap
@@ -4,10 +4,6 @@ exports[`DimensionItem matches the snapshot 1`] = `
 <Fragment>
   <CssVariables
     colors={true}
-    elevations={false}
-    layers={false}
-    spacers={false}
-    theme={false}
   />
   <li
     className="item"
@@ -56,10 +52,6 @@ exports[`DimensionItem matches the snapshot with locked 1`] = `
 <Fragment>
   <CssVariables
     colors={true}
-    elevations={false}
-    layers={false}
-    spacers={false}
-    theme={false}
   />
   <li
     className="item"
@@ -126,10 +118,6 @@ exports[`DimensionItem matches the snapshot with onOptionsClick 1`] = `
 <Fragment>
   <CssVariables
     colors={true}
-    elevations={false}
-    layers={false}
-    spacers={false}
-    theme={false}
   />
   <li
     className="item"
@@ -182,10 +170,6 @@ exports[`DimensionItem matches the snapshot with recommended 1`] = `
 <Fragment>
   <CssVariables
     colors={true}
-    elevations={false}
-    layers={false}
-    spacers={false}
-    theme={false}
   />
   <li
     className="item"
@@ -234,10 +218,6 @@ exports[`DimensionItem matches the snapshot with selected 1`] = `
 <Fragment>
   <CssVariables
     colors={true}
-    elevations={false}
-    layers={false}
-    spacers={false}
-    theme={false}
   />
   <li
     className="item selected"
diff --git a/src/components/OrgUnitDimension/__tests__/__snapshots__/OrgUnitDimension.spec.js.snap b/src/components/OrgUnitDimension/__tests__/__snapshots__/OrgUnitDimension.spec.js.snap
index 1faa60b95..e00e31a72 100644
--- a/src/components/OrgUnitDimension/__tests__/__snapshots__/OrgUnitDimension.spec.js.snap
+++ b/src/components/OrgUnitDimension/__tests__/__snapshots__/OrgUnitDimension.spec.js.snap
@@ -37,11 +37,8 @@ exports[`The OrgUnitDimension component matches the snapshot 1`] = `
   >
     <OrganisationUnitTree
       dataTest="org-unit-tree"
-      filter={Array []}
-      highlighted={Array []}
       initiallyExpanded={Array []}
       onChange={[Function]}
-      renderNodeLabel={[Function]}
       roots={Array []}
       selected={Array []}
     />
@@ -78,12 +75,10 @@ exports[`The OrgUnitDimension component matches the snapshot 1`] = `
       className="deselectButton"
     >
       <Button
-        dataTest="dhis2-uicore-button"
         disabled={true}
         onClick={[Function]}
         secondary={true}
         small={true}
-        type="button"
       >
         Deselect all
       </Button>
diff --git a/src/components/PeriodDimension/__tests__/__snapshots__/FixedPeriodSingleSelect.spec.js.snap b/src/components/PeriodDimension/__tests__/__snapshots__/FixedPeriodSingleSelect.spec.js.snap
index 65f0939ba..e05ade43f 100644
--- a/src/components/PeriodDimension/__tests__/__snapshots__/FixedPeriodSingleSelect.spec.js.snap
+++ b/src/components/PeriodDimension/__tests__/__snapshots__/FixedPeriodSingleSelect.spec.js.snap
@@ -28,73 +28,61 @@ exports[`The Fixed Period Single Select component matches the snapshot 1`] = `
     selected="201405"
   >
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201401"
       label="January 2014"
       value="201401"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201402"
       label="February 2014"
       value="201402"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201403"
       label="March 2014"
       value="201403"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201404"
       label="April 2014"
       value="201404"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201405"
       label="May 2014"
       value="201405"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201406"
       label="June 2014"
       value="201406"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201407"
       label="July 2014"
       value="201407"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201408"
       label="August 2014"
       value="201408"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201409"
       label="September 2014"
       value="201409"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201410"
       label="October 2014"
       value="201410"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201411"
       label="November 2014"
       value="201411"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201412"
       label="December 2014"
       value="201412"
diff --git a/src/components/PeriodDimension/__tests__/__snapshots__/PeriodSelector.spec.js.snap b/src/components/PeriodDimension/__tests__/__snapshots__/PeriodSelector.spec.js.snap
index fb83dcef9..6d97d2035 100644
--- a/src/components/PeriodDimension/__tests__/__snapshots__/PeriodSelector.spec.js.snap
+++ b/src/components/PeriodDimension/__tests__/__snapshots__/PeriodSelector.spec.js.snap
@@ -4,16 +4,10 @@ exports[`The Period Selector component matches the snapshot 1`] = `
 <Transfer
   dataTest="period-dimension-transfer"
   enableOrderChange={true}
-  filterCallback={[Function]}
-  filterCallbackPicked={[Function]}
   height="512px"
-  initialSearchTerm=""
-  initialSearchTermPicked=""
   leftHeader={
     <React.Fragment>
-      <TabBar
-        dataTest="dhis2-uicore-tabbar"
-      >
+      <TabBar>
         <Tab
           dataTest="period-dimension-relative-periods-button"
           onClick={[Function]}
@@ -44,7 +38,6 @@ exports[`The Period Selector component matches the snapshot 1`] = `
       </style>
     </React.Fragment>
   }
-  maxSelections={Infinity}
   onChange={[Function]}
   options={
     Array [