diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java
index a292c76..b8a5d9b 100644
--- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java
+++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfAdapterImpl.java
@@ -465,7 +465,7 @@
     private boolean callHeatbridge(String heatStackId) {
         String executionDir = "/usr/local/lib/python2.7/dist-packages/heatbridge";
         String openstackIdentityUrl = "", username = "", password = "", tenant = "", region = "", owner = "";
-        long waitTimeMs = 10000l;
+        long waitTimeMs = 10000L;
         try {
             String[] cmdarray = {"/usr/bin/python", "HeatBridgeMain.py", openstackIdentityUrl, username, password, tenant, region, owner, heatStackId};
             String[] envp = null;
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java
index 3c5c89f..89d4d0c 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandlerTest.java
@@ -184,7 +184,7 @@
 				req.setAaiServiceId("299392");
 				req.setAction("CREATE");
 				req.setRequestStatus("COMPLETE");
-				req.setProgress(10001l);
+				req.setProgress(10001L);
 				req.setSource("test");
 				req.setStartTime(new Timestamp(10020100));
 				req.setEndTime(new Timestamp(20020100));
@@ -206,7 +206,7 @@
 				req.setAaiServiceId("299392");
 				req.setAction("CREATE");
 				req.setRequestStatus("COMPLETE");
-				req.setProgress(10001l);
+				req.setProgress(10001L);
 				req.setSource("test");
 				req.setStartTime(new Timestamp(10020100));
 				req.setEndTime(new Timestamp(20020100));
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java
index 2d3a2a4..205bb8d 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VnfRequestHandlerTest.java
@@ -182,7 +182,7 @@
 				req.setAaiServiceId("299392");
 				req.setAction("CREATE");
 				req.setRequestStatus("COMPLETE");
-				req.setProgress(10001l);
+				req.setProgress(10001L);
 				req.setSource("test");
 				req.setStartTime(new Timestamp(10020100));
 				req.setEndTime(new Timestamp(20020100));
@@ -207,7 +207,7 @@
 				req.setAaiServiceId("299392");
 				req.setAction("CREATE");
 				req.setRequestStatus("COMPLETE");
-				req.setProgress(10001l);
+				req.setProgress(10001L);
 				req.setSource("test");
 				req.setStartTime(new Timestamp(10020100));
 				req.setEndTime(new Timestamp(20020100));
@@ -229,7 +229,7 @@
 				req.setAaiServiceId("299392");
 				req.setAction("CREATE");
 				req.setRequestStatus("COMPLETE");
-				req.setProgress(10001l);
+				req.setProgress(10001L);
 				req.setSource("test");
 				req.setStartTime(new Timestamp(10020100));
 				req.setEndTime(new Timestamp(20020100));
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java
index bf4d7c4..fa6b06b 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/VolumeRequestHandlerTest.java
@@ -156,7 +156,7 @@
 				req.setAaiServiceId("299392");
 				req.setAction("CREATE");
 				req.setRequestStatus("COMPLETE");
-				req.setProgress(10001l);
+				req.setProgress(10001L);
 				req.setSource("test");
 				req.setStartTime(new Timestamp(10020100));
 				req.setEndTime(new Timestamp(20020100));
@@ -177,7 +177,7 @@
 				req.setAaiServiceId("299392");
 				req.setAction("CREATE");
 				req.setRequestStatus("COMPLETE");
-				req.setProgress(10001l);
+				req.setProgress(10001L);
 				req.setSource("test");
 				req.setStartTime(new Timestamp(10020100));
 				req.setEndTime(new Timestamp(20020100));
@@ -197,7 +197,7 @@
 				req.setAaiServiceId("299392");
 				req.setAction("CREATE");
 				req.setRequestStatus("COMPLETE");
-				req.setProgress(10001l);
+				req.setProgress(10001L);
 				req.setSource("test");
 				req.setStartTime(new Timestamp(10020100));
 				req.setEndTime(new Timestamp(20020100));