Refactor to make the maintanance simpler

- Fixed issue with webhooks

mocks/socket.go

@@ -0,0 +1,9 @@
+package mocks
+
+// MockSocket is a mock implementation of Socket
+// used in the test suite
+type MockSocket struct{}
+
+func (s MockSocket) WriteJSON(i interface{}) error {
+	return nil
+}