diff --git a/.github/workflows/blazorise-ci-basic.yml b/.github/workflows/blazorise-ci-basic.yml
index 39db211edb..d2d8222497 100644
--- a/.github/workflows/blazorise-ci-basic.yml
+++ b/.github/workflows/blazorise-ci-basic.yml
@@ -5,7 +5,7 @@ on: [push]
 jobs:
   build:
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v4
diff --git a/Tests/Blazorise.Tests/DataGrid/Utils/FunctionCompilerTests.cs b/Tests/Blazorise.Tests/DataGrid/Utils/FunctionCompilerTests.cs
index 6acf3fa803..9cc9dc95b4 100644
--- a/Tests/Blazorise.Tests/DataGrid/Utils/FunctionCompilerTests.cs
+++ b/Tests/Blazorise.Tests/DataGrid/Utils/FunctionCompilerTests.cs
@@ -25,8 +25,13 @@ public void ValueGetter_ReturnsCorrectPropertyOrField_DefaultValue( string field
     {
         var test = new Test();
         var valueGetter = FunctionCompiler.CreateValueGetter<Test>( field );
+        var value = valueGetter( test );
 
-        Assert.Equal( expected, valueGetter( test )?.ToString() );
+        Assert.Equal( expected, value switch
+        {
+            DateTime dt => dt.ToString( "M/d/yyyy h:mm:ss tt", CultureInfo.InvariantCulture ),
+            _ => value?.ToString()
+        } );
     }
 
     [Theory]
@@ -47,8 +52,13 @@ public void ValueGetter_ReturnsCorrectPropertyOrField_ActualValue( string field,
     {
         var test = GetTest();
         var valueGetter = FunctionCompiler.CreateValueGetter<Test>( field );
+        var value = valueGetter( test );
 
-        Assert.Equal( expected, valueGetter( test )?.ToString() );
+        Assert.Equal( expected, value switch
+        {
+            DateTime dt => dt.ToString( "M/d/yyyy h:mm:ss tt", CultureInfo.InvariantCulture ),
+            _ => value?.ToString()
+        } );
     }
 
     public FunctionCompilerTests()