                 QuickSpec.current.waitForExpectations(timeout: 1)
                 }
 
-            let oldRequest = specVar
+            let originalRequest = specVar
                 {
                 () -> Request in
-                stubRepeatedRequest()
+                stubRequest()
                 let req = resource().request(.patch, text: "Is there an echo in here?")
                 awaitNewData(req)
                 return req
                 }
 
-            let repeatedRequest = specVar { oldRequest().repeated() }
+            let repeatedRequest = specVar { originalRequest().repeated() }
 
             it("does not send the repeated request automatically")
                 {
-                _ = repeatedRequest()  // Nocilla will flag any request
+                _ = originalRequest()  // Wait for original go through
+                NetworkStub.clearAll() // Tell NetworkStub not to allow any more requests...
+                _ = repeatedRequest()  // ...so that a request here would cause an error
                 }
 
             it("sends a new network request on start()")
                 {
-                stubRepeatedRequest()
                 awaitNewData(repeatedRequest().start())
                 }
 
             it("leaves the old request’s result intact")
                 {
-                _ = oldRequest()
-                stubRepeatedRequest("OK, maybe.")
+                _ = originalRequest()
+                stubRequest("OK, maybe.")
                 awaitNewData(repeatedRequest().start())
 
-                expectResonseText(oldRequest(), text: "No.")        // still has old result
+                expectResonseText(originalRequest(), text: "No.")        // still has old result
                 expectResonseText(repeatedRequest(), text: "OK, maybe.") // has new result
                 }
 
             it("does not call the old request’s callbacks")
                 {
                 var oldRequestHookCalls = 0
-                oldRequest().onCompletion { _ in oldRequestHookCalls += 1 }
-
-                stubRepeatedRequest()
+                originalRequest().onCompletion { _ in oldRequestHookCalls += 1 }
+
                 awaitNewData(repeatedRequest().start())
 
                 expect(oldRequestHookCalls) == 1


        describe("repeated()")
            {
            func stubRepeatedRequest(_ answer: String = "No.", flavorHeader: String? = nil)
                {
                NetworkStub.clearAll()
                NetworkStub.add(


                awaitNewData(req)

                stubRequest(flavorHeader: "mutant flavor 1")
                awaitNewData(req.repeated().start())
                }

