diff --git a/.gitignore b/.gitignore
index 57fb3f6afb..23756f40d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ blobs
 *.swp
 src/changeloglockcleaner/vendor
 **/coverprofile.out
+**/ginkgo.report
 **/coverprofile.out.*
 **/pom.xml.versionsBackup
 bosh-lite/deployments/*
diff --git a/src/autoscaler/api/publicapiserver/middleware_test.go b/src/autoscaler/api/publicapiserver/middleware_test.go
index a77f563af5..d31071d90e 100644
--- a/src/autoscaler/api/publicapiserver/middleware_test.go
+++ b/src/autoscaler/api/publicapiserver/middleware_test.go
@@ -1,6 +1,7 @@
 package publicapiserver_test
 
 import (
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -258,3 +259,19 @@ var _ = Describe("Middleware", func() {
 	})
 
 })
+
+func GetTestHandler() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		_, err := w.Write([]byte("Success"))
+		Expect(err).NotTo(HaveOccurred())
+	}
+}
+
+func CheckResponse(resp *httptest.ResponseRecorder, statusCode int, errResponse models.ErrorResponse) {
+	GinkgoHelper()
+	Expect(resp.Code).To(Equal(statusCode))
+	var errResp models.ErrorResponse
+	err := json.NewDecoder(resp.Body).Decode(&errResp)
+	Expect(err).NotTo(HaveOccurred())
+	Expect(errResp).To(Equal(errResponse))
+}
diff --git a/src/autoscaler/api/publicapiserver/public_api_server_test.go b/src/autoscaler/api/publicapiserver/public_api_server_test.go
index 7387006273..4e7ef24ede 100644
--- a/src/autoscaler/api/publicapiserver/public_api_server_test.go
+++ b/src/autoscaler/api/publicapiserver/public_api_server_test.go
@@ -398,6 +398,7 @@ var _ = Describe("PublicApiServer", func() {
 					BeforeEach(func() {
 						eventGeneratorStatus = http.StatusOK
 					})
+
 					It("should succeed", func() {
 						verifyResponse(httpClient, serverUrl, "/v1/apps/"+TEST_APP_ID+"/aggregated_metric_histories/"+TEST_METRIC_TYPE,
 							map[string]string{"Authorization": TEST_USER_TOKEN, "X-Autoscaler-Token": TEST_CLIENT_TOKEN}, http.MethodGet, "", http.StatusOK)
diff --git a/src/autoscaler/api/publicapiserver/publicapiserver_suite_test.go b/src/autoscaler/api/publicapiserver/publicapiserver_suite_test.go
index c88594175d..4253b4d326 100644
--- a/src/autoscaler/api/publicapiserver/publicapiserver_suite_test.go
+++ b/src/autoscaler/api/publicapiserver/publicapiserver_suite_test.go
@@ -1,9 +1,7 @@
 package publicapiserver_test
 
 import (
-	"encoding/json"
 	"net/http"
-	"net/http/httptest"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -192,6 +190,10 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 	metricsCollectorServer.RouteToHandler(http.MethodGet, metricsCollectorPathMatcher, ghttp.RespondWithJSONEncodedPtr(&metricsCollectorStatus, &metricsCollectorResponse))
 
+	eventGeneratorPathMatcher, err := regexp.Compile(`/v1/apps/[A-Za-z0-9\-]+/aggregated_metric_histories/[a-zA-Z0-9_]+`)
+	Expect(err).NotTo(HaveOccurred())
+	eventGeneratorServer.RouteToHandler(http.MethodGet, eventGeneratorPathMatcher, ghttp.RespondWithJSONEncodedPtr(&eventGeneratorStatus, &eventGeneratorResponse))
+
 	schedulerPathMatcher, err := regexp.Compile(`/v1/apps/[A-Za-z0-9\-]+/schedules`)
 	Expect(err).NotTo(HaveOccurred())
 	schedulerErrJson = "{}"
@@ -204,19 +206,3 @@ var _ = AfterSuite(func() {
 	metricsCollectorServer.Close()
 	eventGeneratorServer.Close()
 })
-
-func GetTestHandler() http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		_, err := w.Write([]byte("Success"))
-		Expect(err).NotTo(HaveOccurred())
-	}
-}
-
-func CheckResponse(resp *httptest.ResponseRecorder, statusCode int, errResponse models.ErrorResponse) {
-	GinkgoHelper()
-	Expect(resp.Code).To(Equal(statusCode))
-	var errResp models.ErrorResponse
-	err := json.NewDecoder(resp.Body).Decode(&errResp)
-	Expect(err).NotTo(HaveOccurred())
-	Expect(errResp).To(Equal(errResponse))
-}
diff --git a/src/autoscaler/helpers/httpclient.go b/src/autoscaler/helpers/httpclient.go
index 7a68d1e717..9371dad834 100644
--- a/src/autoscaler/helpers/httpclient.go
+++ b/src/autoscaler/helpers/httpclient.go
@@ -60,10 +60,10 @@ func (t *TLSReloadTransport) RoundTrip(req *http.Request) (*http.Response, error
 
 	// Checks for cert validity within 5m timeframe. See https://docs.cloudfoundry.org/devguide/deploy-apps/instance-identity.html
 	if t.certificateExpiringWithin(5 * time.Minute) {
-		t.logger.Debug("reloading-cert", lager.Data{"request": req})
+		t.logger.Debug("reloading-cert")
 		t.reloadCert()
 	} else {
-		t.logger.Debug("cert-not-expiring", lager.Data{"request": req})
+		t.logger.Debug("cert-not-expiring")
 	}
 
 	return t.Base.RoundTrip(req)