diff --git a/retrieval/interface_test.go b/retrieval/interface_test.go
index 2ef14db883..05868cfdcd 100644
--- a/retrieval/interface_test.go
+++ b/retrieval/interface_test.go
@@ -21,7 +21,7 @@ func TestInterfaces(t *testing.T) {
 	var (
 		_ Target         = &target{}
 		_ TargetManager  = &targetManager{}
-		_ healthReporter = target{}
+		_ healthReporter = &target{}
 		_ scheduler      = &healthScheduler{}
 	)
 }
diff --git a/retrieval/scheduler_test.go b/retrieval/scheduler_test.go
index 73283b43cf..39c19ac8c2 100644
--- a/retrieval/scheduler_test.go
+++ b/retrieval/scheduler_test.go
@@ -58,9 +58,42 @@ func testHealthScheduler(t test.Tester) {
 			expectedSchedule:  []time.Time{now, now.Add(time.Second * 2), now.Add(time.Minute * 2)},
 		},
 		{
-			futureHealthState: []TargetState{UNKNOWN, UNREACHABLE, UNREACHABLE, UNREACHABLE, UNREACHABLE, UNREACHABLE, UNREACHABLE, UNREACHABLE, UNREACHABLE, UNREACHABLE, UNREACHABLE, UNREACHABLE, UNREACHABLE},
-			preloadedTimes:    []time.Time{now, now.Add(time.Minute), now.Add(time.Minute * 2), now.Add(time.Minute * 3), now.Add(time.Minute * 4), now.Add(time.Minute * 5), now.Add(time.Minute * 6), now.Add(time.Minute * 7), now.Add(time.Minute * 8), now.Add(time.Minute * 9), now.Add(time.Minute * 10), now.Add(time.Minute * 11), now.Add(time.Minute * 12)},
-			expectedSchedule:  []time.Time{now, now.Add(time.Second * 2), now.Add(time.Minute * 1).Add(time.Second * 4), now.Add(time.Minute * 2).Add(time.Second * 8), now.Add(time.Minute * 3).Add(time.Second * 16), now.Add(time.Minute * 4).Add(time.Second * 32), now.Add(time.Minute * 5).Add(time.Second * 64), now.Add(time.Minute * 6).Add(time.Second * 128), now.Add(time.Minute * 7).Add(time.Second * 256), now.Add(time.Minute * 8).Add(time.Second * 512), now.Add(time.Minute * 9).Add(time.Second * 1024), now.Add(time.Minute * 10).Add(time.Minute * 30), now.Add(time.Minute * 11).Add(time.Minute * 30)},
+			futureHealthState: []TargetState{
+				UNKNOWN,
+				UNREACHABLE,
+				UNREACHABLE,
+				UNREACHABLE,
+				UNREACHABLE,
+				UNREACHABLE,
+				UNREACHABLE,
+				UNREACHABLE,
+				UNREACHABLE,
+				UNREACHABLE,
+			},
+			preloadedTimes: []time.Time{
+				now,
+				now.Add(time.Minute),
+				now.Add(time.Minute * 2),
+				now.Add(time.Minute * 3),
+				now.Add(time.Minute * 4),
+				now.Add(time.Minute * 5),
+				now.Add(time.Minute * 6),
+				now.Add(time.Minute * 7),
+				now.Add(time.Minute * 8),
+				now.Add(time.Minute * 9),
+			},
+			expectedSchedule: []time.Time{
+				now,
+				now.Add(time.Second * 2),
+				now.Add(time.Minute * 1).Add(time.Second * 4),
+				now.Add(time.Minute * 2).Add(time.Second * 8),
+				now.Add(time.Minute * 3).Add(time.Second * 16),
+				now.Add(time.Minute * 4).Add(time.Second * 32),
+				now.Add(time.Minute * 5).Add(time.Second * 64),
+				now.Add(time.Minute * 6).Add(time.Minute * 2),
+				now.Add(time.Minute * 7).Add(time.Minute * 2),
+				now.Add(time.Minute * 8).Add(time.Minute * 2),
+			},
 		},
 	}
 
diff --git a/retrieval/targetmanager_test.go b/retrieval/targetmanager_test.go
index cee692eee6..25f44b1519 100644
--- a/retrieval/targetmanager_test.go
+++ b/retrieval/targetmanager_test.go
@@ -75,6 +75,8 @@ func (t *fakeTarget) ScheduledFor() (time time.Time) {
 
 func (t *fakeTarget) Merge(newTarget Target) {}
 
+func (t	*fakeTarget) EstimatedTimeToExecute() time.Duration { return 0 }
+
 func testTargetManager(t test.Tester) {
 	results := make(chan *extraction.Result, 5)
 	targetManager := NewTargetManager(results, 3)