diff --git a/core/src/main/java/com/adobe/Workspace.java b/core/src/main/java/com/adobe/Workspace.java
index 1d57cb3f..cdd7cbda 100644
--- a/core/src/main/java/com/adobe/Workspace.java
+++ b/core/src/main/java/com/adobe/Workspace.java
@@ -27,16 +27,16 @@
 
 public class Workspace {
 
-  static final String IMS_URL = "aio_ims_url";
-  static final String IMS_ORG_ID = "aio_ims_org_id";
-  static final String CONSUMER_ORG_ID = "aio_consumer_org_id";
-  static final String PROJECT_ID = "aio_project_id";
-  static final String WORKSPACE_ID = "aio_workspace_id";
-  static final String API_KEY = "aio_api_key";
-  static final String CREDENTIAL_ID = "aio_credential_id";
-  static final String CLIENT_SECRET = "aio_client_secret";
-  static final String TECHNICAL_ACCOUNT_ID = "aio_technical_account_id";
-  static final String META_SCOPES = "aio_meta_scopes";
+  public static final String IMS_URL = "aio_ims_url";
+  public static final String IMS_ORG_ID = "aio_ims_org_id";
+  public static final String CONSUMER_ORG_ID = "aio_consumer_org_id";
+  public static final String PROJECT_ID = "aio_project_id";
+  public static final String WORKSPACE_ID = "aio_workspace_id";
+  public static final String API_KEY = "aio_api_key";
+  public static final String CREDENTIAL_ID = "aio_credential_id";
+  public static final String CLIENT_SECRET = "aio_client_secret";
+  public static final String TECHNICAL_ACCOUNT_ID = "aio_technical_account_id";
+  public static final String META_SCOPES = "aio_meta_scopes";
 
   // Auth related :
   private final String imsUrl;
diff --git a/events_mgmt/src/main/java/com/adobe/event/management/model/EventMetadata.java b/events_mgmt/src/main/java/com/adobe/event/management/model/EventMetadata.java
index 778a0630..f5b9287e 100644
--- a/events_mgmt/src/main/java/com/adobe/event/management/model/EventMetadata.java
+++ b/events_mgmt/src/main/java/com/adobe/event/management/model/EventMetadata.java
@@ -39,7 +39,7 @@ private EventMetadata(String eventCode, String label, String description,
       String sampleEventTemplate) {
     if (StringUtils.isEmpty(eventCode)) {
       throw new IllegalArgumentException(
-          "EventMetadata is missing a label");
+          "EventMetadata is missing an Event Code");
     }
     this.eventCode = eventCode;
     this.label = (StringUtils.isEmpty(label)) ? eventCode : label;
diff --git a/osgi/pom.xml b/osgi/pom.xml
index d593e846..e3dd5b97 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -83,6 +83,11 @@
       <artifactId>jjwt-jackson</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
@@ -149,7 +154,8 @@
               feign-form,
               feign-slf4j,
               feign-jackson,
-              commons-lang3
+              commons-lang3,
+              jakarta.xml.bind-api
             </Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
             <Import-Package>
@@ -161,7 +167,6 @@
               !com.sun.activation.*,
               !sun.misc.*,
               !lombok.*,
-              !jakarta.xml.bind.*,
               !jakarta.activation.*,
               *
             </Import-Package>
diff --git a/osgi/slingInstall.sh b/osgi/slingInstall.sh
new file mode 100755
index 00000000..aeac2765
--- /dev/null
+++ b/osgi/slingInstall.sh
@@ -0,0 +1,20 @@
+#
+# Copyright 2017 Adobe. All rights reserved.
+# This file is licensed to you under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License. You may obtain a copy
+# of the License at http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed under
+# the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+# OF ANY KIND, either express or implied. See the License for the specific language
+# governing permissions and limitations under the License.
+#
+
+source ~/.bash_profile
+echo ""
+echo "=================================================================="
+echo " Build and deploy com.adobe.aio-lib-java.osgi on local AEM server"
+echo "=================================================================="
+mvn -Dcrx.path=/apps/eventproxy/install.author -Dlicense.header.path=../copyright_header.txt -P localInstall clean install sling:install
+
+
diff --git a/pom.xml b/pom.xml
index c27978b8..22a061b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,7 @@
 
     <commons-text.version>1.6</commons-text.version>
     <junit.version>4.11</junit.version>
+    <wiremock.version>2.31.0</wiremock.version>
     <okhttp3.mockwebserver.version>4.9.1</okhttp3.mockwebserver.version>
     <mockito.version>3.11.1</mockito.version>
     <slf4j.version>1.7.13</slf4j.version>
@@ -164,6 +165,13 @@
         <scope>test</scope>
       </dependency>
 
+      <dependency>
+        <groupId>com.github.tomakehurst</groupId>
+        <artifactId>wiremock-jre8</artifactId>
+        <version>${wiremock.version}</version>
+        <scope>test</scope>
+      </dependency>
+
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-simple</artifactId>