diff --git a/src/CarbonAware.DataSources/CarbonAware.DataSources.WattTime/test/Client/WattTimeClientTests.cs b/src/CarbonAware.DataSources/CarbonAware.DataSources.WattTime/test/Client/WattTimeClientTests.cs
index 48d014ea3..8952db62d 100644
--- a/src/CarbonAware.DataSources/CarbonAware.DataSources.WattTime/test/Client/WattTimeClientTests.cs
+++ b/src/CarbonAware.DataSources/CarbonAware.DataSources.WattTime/test/Client/WattTimeClientTests.cs
@@ -152,7 +152,7 @@ public async Task GetDataAsync_RefreshesTokenWhenExpired()
         var emissionsResponse = await client.GetDataAsync("region", new DateTimeOffset(), new DateTimeOffset());
 
         Assert.IsTrue(emissionsResponse.Data.Count() > 0);
-        Assert.AreEqual("region", emissionsResponse.Meta.Region);
+        Assert.AreEqual(TestData.TestDataConstants.Region, emissionsResponse.Meta.Region);
     }
 
     [Test]
@@ -165,7 +165,7 @@ public async Task GetDataAsync_RefreshesTokenWhenNoneSet()
         var gridEmissionsResponse = await client.GetDataAsync("region", new DateTimeOffset(), new DateTimeOffset());
 
         Assert.IsTrue(gridEmissionsResponse.Data.Count() > 0);
-        Assert.AreEqual("region", gridEmissionsResponse.Meta.Region);
+        Assert.AreEqual(TestData.TestDataConstants.Region, gridEmissionsResponse.Meta.Region);
     }
 
     [Test]
@@ -241,15 +241,15 @@ public async Task GetForecastOnDateAsync_DeserializesExpectedResponse()
         this.AddHandlers_Auth();
         this.AddHandler_RequestResponse(r =>
         {
-            return r.RequestUri!.ToString().Equals("https://api2.watttime.org/v2/forecast?ba=balauth&starttime=2022-04-22T00%3a00%3a00.0000000%2b00%3a00&endtime=2022-04-22T00%3a00%3a00.0000000%2b00%3a00") && r.Method == HttpMethod.Get;
+            return r.RequestUri!.ToString().Equals("https://api.watttime.org/v3/forecast/historical?region=region&start=2022-04-22T00%3a00%3a00.0000000%2b00%3a00&end=2022-04-22T00%3a00%3a00.0000000%2b00%3a00&signal_type=co2_moer") && r.Method == HttpMethod.Get;
         }, System.Net.HttpStatusCode.OK, TestData.GetHistoricalForecastDataJsonString());
 
         var client = new WattTimeClient(this.HttpClientFactory, this.Options.Object, this.Log.Object, this.MemoryCache);
         client.SetBearerAuthenticationHeader(this.DefaultTokenValue);
-        var ba = new RegionResponse() { Region = "region" };
+        var region = new RegionResponse() { Region = "region" };
 
-        var forecastResponse = await client.GetForecastOnDateAsync(ba.Region, new DateTimeOffset(2022, 4, 22, 0, 0, 0, TimeSpan.Zero));
-        var overloadedForecast = await client.GetForecastOnDateAsync(ba, new DateTimeOffset(2022, 4, 22, 0, 0, 0, TimeSpan.Zero));
+        var forecastResponse = await client.GetForecastOnDateAsync(region.Region, new DateTimeOffset(2022, 4, 22, 0, 0, 0, TimeSpan.Zero));
+        var overloadedForecast = await client.GetForecastOnDateAsync(region, new DateTimeOffset(2022, 4, 22, 0, 0, 0, TimeSpan.Zero));
 
         Assert.AreEqual(forecastResponse!.Meta.GeneratedAt, overloadedForecast!.Meta.GeneratedAt);
         Assert.AreEqual(forecastResponse.Data[0].Forecast.First(), overloadedForecast.Data[0].Forecast.First());
@@ -259,7 +259,7 @@ public async Task GetForecastOnDateAsync_DeserializesExpectedResponse()
 
         var forecastDataPoint = forecastResponse.Data[0].Forecast.ToList().First();
         Assert.AreEqual(TestData.TestDataConstants.PointTime, forecastDataPoint.PointTime);
-        Assert.AreEqual(TestData.TestDataConstants.Value, forecastDataPoint.Value.ToString("0.00", CultureInfo.InvariantCulture)); //Format float to avoid precision issues
+        Assert.AreEqual(TestData.TestDataConstants.Value.ToString("0.00", CultureInfo.InvariantCulture), forecastDataPoint.Value.ToString("0.00", CultureInfo.InvariantCulture)); //Format float to avoid precision issues
         Assert.AreEqual("1.0", forecastDataPoint.Version);
     }
 
diff --git a/src/CarbonAware.DataSources/CarbonAware.DataSources.WattTime/test/WattTimeDataSourceTests.cs b/src/CarbonAware.DataSources/CarbonAware.DataSources.WattTime/test/WattTimeDataSourceTests.cs
index b1620205a..d20889600 100644
--- a/src/CarbonAware.DataSources/CarbonAware.DataSources.WattTime/test/WattTimeDataSourceTests.cs
+++ b/src/CarbonAware.DataSources/CarbonAware.DataSources.WattTime/test/WattTimeDataSourceTests.cs
@@ -1,4 +1,5 @@
 using CarbonAware.DataSources.WattTime.Client;
+using CarbonAware.DataSources.WattTime.Client.Tests;
 using CarbonAware.DataSources.WattTime.Constants;
 using CarbonAware.DataSources.WattTime.Model;
 using CarbonAware.Exceptions;
@@ -119,7 +120,7 @@ public async Task GetCarbonIntensityForecastAsync_ReturnsResultsWhenRecordsFound
         // Arrange
         var startDate = this.DefaultDataStartTime;
         var endDate = startDate.AddMinutes(1);
-        var generatedAt = new DateTimeOffset(2022, 4, 18, 12, 30, 00, TimeSpan.FromHours(-6));
+        var generatedAt = TestData.TestDataConstants.GeneratedAt;// new DateTimeOffset(2022, 4, 18, 12, 30, 00, TimeSpan.FromHours(-6));
         var lbsPerMwhEmissions = 10;
         var gPerKwhEmissions = this.DataSource.ConvertMoerToGramsPerKilowattHour(lbsPerMwhEmissions);
         var expectedDuration = TimeSpan.FromMinutes(5);
@@ -324,7 +325,7 @@ private HistoricalForecastEmissionsDataResponse GenerateHistoricalForecastRespon
                 new HistoricalEmissionsData()
                 {
                     Forecast = data,
-                    GeneratedAt = DateTimeOffset.Now
+                    GeneratedAt = TestData.TestDataConstants.GeneratedAt
                 }
             },
             Meta = meta