diff --git a/src/Reveal.Sdk.Dom.Tests/Visualizations/Settings/KpiTimeVisualizationSettingsFixture.cs b/src/Reveal.Sdk.Dom.Tests/Visualizations/Settings/KpiTimeVisualizationSettingsFixture.cs
index 039ca8ea..da72a0ee 100644
--- a/src/Reveal.Sdk.Dom.Tests/Visualizations/Settings/KpiTimeVisualizationSettingsFixture.cs
+++ b/src/Reveal.Sdk.Dom.Tests/Visualizations/Settings/KpiTimeVisualizationSettingsFixture.cs
@@ -78,4 +78,43 @@ public void ToJsonString_GeneratesCorrectJson_WhenSerialized()
         // Assert
         Assert.Equal(expectedJObject, actualJObject);
     }
+    
+    [Theory]
+    [InlineData(KpiTimePeriod.MonthToDatePreviousMonth, IndicatorVisualizationType.MonthToDatePreviousMonth)]
+    [InlineData(KpiTimePeriod.MonthToDatePreviousYear, IndicatorVisualizationType.MonthToDatePreviousYear)]
+    [InlineData(KpiTimePeriod.QuarterToDatePreviousQuarter, IndicatorVisualizationType.QuarterToDatePreviousQuarter)]
+    [InlineData(KpiTimePeriod.QuarterToDatePreviousYear, IndicatorVisualizationType.QuarterToDatePreviousYear)]
+    [InlineData(KpiTimePeriod.YearToDatePreviousYear, IndicatorVisualizationType.YearToDatePreviousYear)]
+    [InlineData((KpiTimePeriod)999, IndicatorVisualizationType.MonthToDatePreviousMonth)]
+    internal void ConvertKpiTimePeriodToIndicatorVisualizationType_MapCorrectly_WhenCalled(KpiTimePeriod input, IndicatorVisualizationType expected)
+    {
+        // Arrange
+        var settings = new KpiTimeVisualizationSettings();
+
+        // Act
+        var result = settings.ConvertKpiTimePeriodToIndicatorVisualizationType(input);
+
+        // Assert
+        Assert.Equal(expected, result);
+    }
+
+    [Theory]
+    [InlineData(IndicatorVisualizationType.MonthToDatePreviousMonth, KpiTimePeriod.MonthToDatePreviousMonth)]
+    [InlineData(IndicatorVisualizationType.MonthToDatePreviousYear, KpiTimePeriod.MonthToDatePreviousYear)]
+    [InlineData(IndicatorVisualizationType.QuarterToDatePreviousQuarter, KpiTimePeriod.QuarterToDatePreviousQuarter)]
+    [InlineData(IndicatorVisualizationType.QuarterToDatePreviousYear, KpiTimePeriod.QuarterToDatePreviousYear)]
+    [InlineData(IndicatorVisualizationType.YearToDatePreviousYear, KpiTimePeriod.YearToDatePreviousYear)]
+    [InlineData((IndicatorVisualizationType)999, KpiTimePeriod.MonthToDatePreviousMonth)]
+    internal void ConvertIndicatorVisualizationTypeToKpiTimePeriod_MapCorrectly_WhenCalled(IndicatorVisualizationType input, KpiTimePeriod expected)
+    {
+        // Arrange
+        var settings = new KpiTimeVisualizationSettings();
+
+        // Act
+        var result = settings.ConvertIndicatorVisualizationTypeToKpiTimePeriod(input);
+
+        // Assert
+        Assert.Equal(expected, result);
+    }
+
 }
\ No newline at end of file
diff --git a/src/Reveal.Sdk.Dom/Visualizations/Settings/KpiTimeVisualizationSettings.cs b/src/Reveal.Sdk.Dom/Visualizations/Settings/KpiTimeVisualizationSettings.cs
index f9db0bb0..3b113110 100644
--- a/src/Reveal.Sdk.Dom/Visualizations/Settings/KpiTimeVisualizationSettings.cs
+++ b/src/Reveal.Sdk.Dom/Visualizations/Settings/KpiTimeVisualizationSettings.cs
@@ -24,7 +24,7 @@ public KpiTimePeriod TimePeriod
 
         internal IndicatorVisualizationDataSpec VisualizationDataSpec { get; set; }
 
-        IndicatorVisualizationType ConvertKpiTimePeriodToIndicatorVisualizationType(KpiTimePeriod timePeriod)
+        internal IndicatorVisualizationType ConvertKpiTimePeriodToIndicatorVisualizationType(KpiTimePeriod timePeriod)
         {
             return timePeriod switch
             {
@@ -37,7 +37,7 @@ IndicatorVisualizationType ConvertKpiTimePeriodToIndicatorVisualizationType(KpiT
             };
         }
 
-        KpiTimePeriod ConvertIndicatorVisualizationTypeToKpiTimePeriod(IndicatorVisualizationType visualizationType)
+        internal KpiTimePeriod ConvertIndicatorVisualizationTypeToKpiTimePeriod(IndicatorVisualizationType visualizationType)
         {
             return visualizationType switch
             {