diff --git a/accord-core/src/test/java/accord/coordinate/tracking/FastPathTrackerReconciler.java b/accord-core/src/test/java/accord/coordinate/tracking/FastPathTrackerReconciler.java
index b10f8b554f..1c852fd9fe 100644
--- a/accord-core/src/test/java/accord/coordinate/tracking/FastPathTrackerReconciler.java
+++ b/accord-core/src/test/java/accord/coordinate/tracking/FastPathTrackerReconciler.java
@@ -66,7 +66,8 @@ void validate(RequestStatus status)
 
             case Success:
                 Assertions.assertTrue(tracker.all(FastPathShardTracker::hasReachedQuorum));
-                Assertions.assertTrue(tracker.all(shard -> shard.fastPathIsRejected() || shard.hasMetFastPathCriteria() || shard.fastPathIsDelayed()));
+                // Covers the conditions which allow Success to be returned in FastPathTracker.java
+                Assertions.assertTrue(tracker.all(shard -> shard.fastPathIsRejected() || shard.hasMetFastPathCriteria() || shard.fastPathIsDelayed() || (shard.fastPathFailures + shard.fastPathDelayed > 0)));
                 Assertions.assertFalse(tracker.any(FastPathShardTracker::hasFailed));
                 break;
 
diff --git a/accord-core/src/test/java/accord/topology/TopologyRandomizer.java b/accord-core/src/test/java/accord/topology/TopologyRandomizer.java
index c778e707c1..06d54fa9a6 100644
--- a/accord-core/src/test/java/accord/topology/TopologyRandomizer.java
+++ b/accord-core/src/test/java/accord/topology/TopologyRandomizer.java
@@ -430,6 +430,11 @@ private boolean validToReassignRange(Topology current, Shard[] nextShards, Map<I
 
     private boolean previousEpochForRegainedRangeRetired(Topology current, Ranges regainingRanges)
     {
+        // When nodeLookup isn't defined we are unable to get node state, so
+        // assume that the calling test doesn't care about retired ranges
+        if (this.nodeLookup == null)
+            return true;
+
         for (Id id : current.nodes())
         {
             Node node = this.nodeLookup.apply(id);