diff --git a/src/test/java/com/cedarsoftware/util/TestDateUtilities.java b/src/test/java/com/cedarsoftware/util/TestDateUtilities.java
index 8e80569d..4cbfc527 100644
--- a/src/test/java/com/cedarsoftware/util/TestDateUtilities.java
+++ b/src/test/java/com/cedarsoftware/util/TestDateUtilities.java
@@ -555,8 +555,9 @@ void testDateToStringFormat()
         boolean okToTest = false;
 
         for (String zoneName : timeZoneOldSchoolNames) {
-            if (dateToString.contains(zoneName)) {
+            if (dateToString.contains(" " + zoneName)) {
                 okToTest = true;
+                break;
             }
         }
 
@@ -874,7 +875,7 @@ void testTimeZoneParsing(String exampleZone, Long epochMilli)
     @Test
     void testTimeBetterThanMilliResolution()
     {
-        ZonedDateTime zonedDateTime = (ZonedDateTime) DateUtilities.parseDate("Jan 22nd, 2024 21:52:05.123456789-05:00", ZoneId.systemDefault(), true);
+        ZonedDateTime zonedDateTime = DateUtilities.parseDate("Jan 22nd, 2024 21:52:05.123456789-05:00", ZoneId.systemDefault(), true);
         assertEquals(123456789, zonedDateTime.getNano());
         assertEquals(2024, zonedDateTime.getYear());
         assertEquals(1, zonedDateTime.getMonthValue());