UT changes and fixes

Change-Id: I31bb8fcfb562bf32519f0f3bd2bbcfdae7aff728
Signed-off-by: Markku Virtanen <markku.virtanen@nokia.com>
diff --git a/pkg/control/registry.go b/pkg/control/registry.go
index d7f8011..93a287a 100644
--- a/pkg/control/registry.go
+++ b/pkg/control/registry.go
@@ -101,7 +101,7 @@
 			r.restSubscriptions[restSubId] = restSubscription
 			return restSubscription, nil
 		} else {
-			return restSubscription, fmt.Errorf("Registry: REST delete request is still ongoing for the endpoint=%v, restSubId=%v, SubDelReqOngoing=%v, SubReqOngoing=%v", restSubscription, restSubId, restSubscription.SubDelReqOngoing, restSubscription.SubReqOngoing)
+			return restSubscription, fmt.Errorf("Registry: REST request is still ongoing for the endpoint=%v, restSubId=%v, SubDelReqOngoing=%v, SubReqOngoing=%v", restSubscription, restSubId, restSubscription.SubDelReqOngoing, restSubscription.SubReqOngoing)
 		}
 		return restSubscription, nil
 	}