diff --git a/blueflood-core/src/main/java/com/rackspacecloud/blueflood/service/ScheduleContext.java b/blueflood-core/src/main/java/com/rackspacecloud/blueflood/service/ScheduleContext.java
index <HASH>..<HASH> 100644
--- a/blueflood-core/src/main/java/com/rackspacecloud/blueflood/service/ScheduleContext.java
+++ b/blueflood-core/src/main/java/com/rackspacecloud/blueflood/service/ScheduleContext.java
@@ -151,9 +151,11 @@ public class ScheduleContext implements IngestionContext, ScheduleContextMBean {
         this.clock = clock;
         registerMBean();
     }
-
     public ScheduleContext(long currentTimeMillis, Collection<Integer> managedShards) {
-        this(currentTimeMillis, managedShards, new DefaultClockImpl());
+        this.scheduleTime = currentTimeMillis;
+        this.shardStateManager = new ShardStateManager(managedShards, asMillisecondsSinceEpochTicker());
+        this.lockManager = new NoOpShardLockManager();
+        this.clock = new DefaultClockImpl();
         registerMBean();
     }
     @VisibleForTesting
Initialize fields in the constructor. Don't indirectly call registerMBean.