diff --git a/apigeeSync_suite_test.go b/apigeeSync_suite_test.go
index 99c0ecc..6d78571 100644
--- a/apigeeSync_suite_test.go
+++ b/apigeeSync_suite_test.go
@@ -59,6 +59,9 @@
 		Expect(req.Header.Get("Content-Type")).To(Equal("application/x-www-form-urlencoded; param=value"))
 
 		err := req.ParseForm()
+		// TODO: Test framework cannot handle this assertions and
+		// this handler just stops and sends back ""
+		// we need to handle it differently
 		Expect(err).NotTo(HaveOccurred())
 		Expect(req.Form.Get("grant_type")).To(Equal("client_credentials"))
 		Expect(req.Header.Get("status")).To(Equal("ONLINE"))
diff --git a/apigee_sync.go b/apigee_sync.go
index 230705c..f915646 100644
--- a/apigee_sync.go
+++ b/apigee_sync.go
@@ -259,6 +259,7 @@
 	}
 
 	var oauthResp oauthTokenResp
+	log.Debugf("Response: %s ", body)
 	err = json.Unmarshal(body, &oauthResp)
 	if err != nil {
 		log.Error(err)
@@ -361,7 +362,7 @@
 	/* Get the bearer token */
 	status := getBearerToken()
 	if status == false {
-		log.Panic("Unable to get Bearer token or is Invalid")
+		log.Errorf("Unable to get Bearer token or is Invalid")
 	}
 	snapshotUri, err := url.Parse(config.GetString(configSnapServerBaseURI))
 	if err != nil {
diff --git a/pluginData.go b/pluginData.go
index a470c1c..9368f70 100644
--- a/pluginData.go
+++ b/pluginData.go
@@ -6,6 +6,6 @@
 	Name:    "apidApigeeSync",
 	Version: "0.0.3",
 	ExtraData: map[string]interface{}{
-		"schemaVersion": "0.0.3",
+		"schemaVersion": "0.0.2",
 	},
 }