diff --git a/src/components/DataDimension/Calculation/CalculationModal.js b/src/components/DataDimension/Calculation/CalculationModal.js
index 4d3c23146..6fdcf8119 100644
--- a/src/components/DataDimension/Calculation/CalculationModal.js
+++ b/src/components/DataDimension/Calculation/CalculationModal.js
@@ -445,7 +445,7 @@ const CalculationModal = ({
                 </ModalActions>
             </Modal>
             {showDeletePrompt && (
-                <Modal small>
+                <Modal small dataTest="calculation-delete-modal">
                     <ModalTitle>{i18n.t('Delete calculation')}</ModalTitle>
                     <ModalContent>
                         {i18n.t(
diff --git a/src/components/DataDimension/Calculation/DataElementOption.js b/src/components/DataDimension/Calculation/DataElementOption.js
index 584386ee8..7743ff3b3 100644
--- a/src/components/DataDimension/Calculation/DataElementOption.js
+++ b/src/components/DataDimension/Calculation/DataElementOption.js
@@ -26,7 +26,11 @@ const DataElementOption = ({ label, value, onDoubleClick }) => {
                 ref={setNodeRef}
                 style={style}
             >
-                <div className="chip" onDoubleClick={() => onDoubleClick(data)}>
+                <div
+                    className="chip"
+                    onDoubleClick={() => onDoubleClick(data)}
+                    data-test="data-element-option"
+                >
                     <span className="icon">
                         {getIcon(DIMENSION_TYPE_DATA_ELEMENT)}
                     </span>
diff --git a/src/components/DataDimension/Calculation/DataElementSelector.js b/src/components/DataDimension/Calculation/DataElementSelector.js
index 2deeff868..123fe20fd 100644
--- a/src/components/DataDimension/Calculation/DataElementSelector.js
+++ b/src/components/DataDimension/Calculation/DataElementSelector.js
@@ -69,6 +69,7 @@ const GroupSelector = ({ currentValue, onChange, displayNameProp }) => {
                         value={defaultGroup.id}
                         key={defaultGroup.id}
                         label={defaultGroup.getName()}
+                        dataTest={`data-element-group-select-option-${defaultGroup.id}`}
                     />
                 ) : null}
                 {!loading
@@ -77,6 +78,7 @@ const GroupSelector = ({ currentValue, onChange, displayNameProp }) => {
                               value={group.id}
                               key={group.id}
                               label={group.name}
+                              dataTest={`data-element-group-select-option-${group.id}`}
                           />
                       ))
                     : null}
@@ -107,6 +109,7 @@ const DisaggregationSelector = ({ currentValue, onChange }) => {
                         value={option[0]}
                         key={option[0]}
                         label={option[1]}
+                        dataTest={`data-element-disaggregation-select-option-${option[0]}`}
                     />
                 ))}
             </SingleSelectField>
diff --git a/src/components/DataDimension/Calculation/FormulaField.js b/src/components/DataDimension/Calculation/FormulaField.js
index 075ff285c..388394deb 100644
--- a/src/components/DataDimension/Calculation/FormulaField.js
+++ b/src/components/DataDimension/Calculation/FormulaField.js
@@ -13,7 +13,7 @@ export const LAST_DROPZONE_ID = 'lastdropzone'
 export const FORMULA_BOX_ID = 'formulabox'
 
 const Placeholder = () => (
-    <div className="placeholder" data-test={'placeholder'}>
+    <div className="placeholder" data-test="placeholder">
         <FormulaIcon />
         <span className="help-text">
             {i18n.t(
@@ -47,7 +47,7 @@ const FormulaField = ({
             <div
                 className="formula-field"
                 ref={setLastDropzoneRef}
-                data-test={'formula-field'}
+                data-test="formula-field"
             >
                 {loading && (
                     <Center>
diff --git a/src/components/DataDimension/Calculation/MathOperatorSelector.js b/src/components/DataDimension/Calculation/MathOperatorSelector.js
index dd4d4321a..d87689f6a 100644
--- a/src/components/DataDimension/Calculation/MathOperatorSelector.js
+++ b/src/components/DataDimension/Calculation/MathOperatorSelector.js
@@ -9,7 +9,7 @@ const MathOperatorSelector = ({ onDoubleClick }) => (
     <>
         <div className="wrapper">
             <h4 className="sub-header">{i18n.t('Math operators')}</h4>
-            <div className="operators">
+            <div className="operators" data-test="operators-list">
                 {getOperators().map(({ label, value, type }, index) => (
                     <DraggableOperator
                         key={`${label}-${index}`}
diff --git a/src/components/LegendKey/LegendKey.js b/src/components/LegendKey/LegendKey.js
index 873a95a2b..05104bf8b 100644
--- a/src/components/LegendKey/LegendKey.js
+++ b/src/components/LegendKey/LegendKey.js
@@ -5,7 +5,7 @@ import styles from './styles/LegendKey.style.js'
 
 const LegendKey = ({ legendSets }) => {
     return legendSets.length ? (
-        <div className="container" data-test={'legend-key-container'}>
+        <div className="container" data-test="legend-key-container">
             {legendSets.map((legendSet, index) => (
                 <div
                     key={legendSet.id}