diff --git a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphQueryTest.java b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphQueryTest.java
index fd0dd0a6..d00d2bc4 100644
--- a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphQueryTest.java
+++ b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphQueryTest.java
@@ -18,38 +18,38 @@ public void shouldCountVerticesEdges() {
 
     // Count on V
     Long count = graph.traversal().V().count().toList().get(0);
-    Assert.assertEquals(new Long(4), count);
+    Assert.assertEquals(Long.valueOf(4), count);
 
     count = graph.traversal().V().hasLabel("Person").count().toList().get(0);
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
 
     count = graph.traversal().V().hasLabel("Animal").count().toList().get(0);
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
 
     count = graph.traversal().V().hasLabel("Animal", "Person").count().toList().get(0);
-    Assert.assertEquals(new Long(4), count);
+    Assert.assertEquals(Long.valueOf(4), count);
 
     // Count on E
 
     count = graph.traversal().E().count().toList().get(0);
-    Assert.assertEquals(new Long(3), count);
+    Assert.assertEquals(Long.valueOf(3), count);
 
     count = graph.traversal().E().hasLabel("HasFriend").count().toList().get(0);
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     count = graph.traversal().E().hasLabel("HasAnimal").count().toList().get(0);
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
 
     count = graph.traversal().E().hasLabel("HasAnimal", "HasFriend").count().toList().get(0);
-    Assert.assertEquals(new Long(3), count);
+    Assert.assertEquals(Long.valueOf(3), count);
 
     // Inverted Count
 
     count = graph.traversal().V().hasLabel("HasFriend").count().toList().get(0);
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     count = graph.traversal().E().hasLabel("Person").count().toList().get(0);
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     // More Complex Count
 
@@ -62,29 +62,29 @@ public void shouldCountVerticesEdges() {
             .count()
             .toList()
             .get(0);
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
 
     // With Polymorphism
 
     count = graph.traversal().V().has("Person", "name", "Jon").out("E").count().toList().get(0);
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
 
     // With Base Class V/E
 
     count = graph.traversal().V().has("name", "Jon").count().toList().get(0);
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     count = graph.traversal().E().has("name", "Jon").count().toList().get(0);
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     count = graph.traversal().V().has("name", "Jon").out("E").count().toList().get(0);
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
 
     count = graph.traversal().E().has("marker", 10).count().toList().get(0);
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     count = graph.traversal().V().has("marker", 10).count().toList().get(0);
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
   }
 
   @Test
@@ -95,19 +95,19 @@ public void shouldCountVerticesEdgesOnTXRollback() {
     // Count on V
     Long count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     graph.addVertex("name", "Jon");
 
     count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     graph.tx().rollback();
 
     count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     graph.close();
   }
@@ -120,18 +120,18 @@ public void shouldExecuteTraversalWithSpecialCharacters() {
     // Count on V
     Long count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     graph.addVertex("identifier", 1);
 
     count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     graph.tx().commit();
 
     count = graph.traversal().V().has("~identifier", 1).count().toList().get(0);
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     graph.close();
   }
@@ -147,13 +147,13 @@ public void shouldNotBlowWithWrongClass() {
 
       Integer count = graph.traversal().V().hasLabel("Wrong").toList().size();
 
-      Assert.assertEquals(new Integer(0), count);
+      Assert.assertEquals(Integer.valueOf(0), count);
 
       // Count on Person + Wrong Class
 
       count = graph.traversal().V().hasLabel("Person", "Wrong").toList().size();
 
-      Assert.assertEquals(new Integer(2), count);
+      Assert.assertEquals(Integer.valueOf(2), count);
     } finally {
       graph.close();
     }
@@ -194,19 +194,19 @@ public void shouldCountVerticesEdgesOnTXCommit() {
     // Count on V
     Long count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     graph.addVertex("name", "Jon");
 
     count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     graph.tx().commit();
 
     count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     graph.close();
   }
@@ -221,7 +221,7 @@ public void shouldWorkWithTwoLabels() {
     // Count on V
     Long count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     graph.addVertex(T.label, "Person", "name", "Jon");
 
@@ -237,7 +237,7 @@ public void shouldWorkWithTwoLabels() {
             .toList()
             .get(0);
 
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     graph.close();
   }
diff --git a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphTest.java b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphTest.java
index 40ab4964..d9000e74 100755
--- a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphTest.java
+++ b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/OrientGraphTest.java
@@ -327,7 +327,7 @@ public void openWithEmptyConfig() {
 
     graph.addVertex(T.label, "V", "name", "Foo");
 
-    Assert.assertEquals(new Long(1), graph.traversal().V().count().toList().iterator().next());
+    Assert.assertEquals(Long.valueOf(1), graph.traversal().V().count().toList().iterator().next());
 
     graph.drop();
   }
@@ -340,7 +340,8 @@ public void openWithMemoryDatabase() {
     try {
       graph.addVertex(T.label, "V", "name", "Foo");
 
-      Assert.assertEquals(new Long(1), graph.traversal().V().count().toList().iterator().next());
+      Assert.assertEquals(
+          Long.valueOf(1), graph.traversal().V().count().toList().iterator().next());
     } finally {
       graph.drop();
     }
@@ -354,7 +355,8 @@ public void openWithLocalDatabase() {
     try {
       graph.addVertex(T.label, "V", "name", "Foo");
 
-      Assert.assertEquals(new Long(1), graph.traversal().V().count().toList().iterator().next());
+      Assert.assertEquals(
+          Long.valueOf(1), graph.traversal().V().count().toList().iterator().next());
     } finally {
       graph.drop();
     }
@@ -378,7 +380,8 @@ public void openWithConfiguration() {
       Assert.assertEquals(true, graph.tx().isOpen());
       Assert.assertEquals(true, vertex.getRawElement().getIdentity().isNew());
       graph.tx().commit();
-      Assert.assertEquals(new Long(1), graph.traversal().V().count().toList().iterator().next());
+      Assert.assertEquals(
+          Long.valueOf(1), graph.traversal().V().count().toList().iterator().next());
     } finally {
       graph.drop();
     }
@@ -392,7 +395,7 @@ public void shouldOpenAFactoryInMemory() {
     OrientGraph graph = factory.getNoTx();
     graph.addVertex(T.label, "V", "name", "Foo");
 
-    Assert.assertEquals(new Long(1), graph.traversal().V().count().toList().iterator().next());
+    Assert.assertEquals(Long.valueOf(1), graph.traversal().V().count().toList().iterator().next());
 
     factory.drop();
   }
diff --git a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/executor/OrientGraphExecuteFunctionTest.java b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/executor/OrientGraphExecuteFunctionTest.java
index 401552d9..8d27928b 100644
--- a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/executor/OrientGraphExecuteFunctionTest.java
+++ b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/executor/OrientGraphExecuteFunctionTest.java
@@ -78,7 +78,7 @@ public void testExecuteGremlinFunctionCountQueryTest() {
 
     Assert.assertEquals(true, gremlin.hasNext());
     Object result = gremlin.next();
-    Assert.assertEquals(new Long(2), result);
+    Assert.assertEquals(Long.valueOf(2), result);
   }
 
   @Test
diff --git a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/executor/OrientGraphExecuteQueryTest.java b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/executor/OrientGraphExecuteQueryTest.java
index 1be74114..56fa1a09 100644
--- a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/executor/OrientGraphExecuteQueryTest.java
+++ b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/executor/OrientGraphExecuteQueryTest.java
@@ -73,7 +73,7 @@ public void testExecuteGremlinCountQueryTest() {
     Assert.assertEquals(true, iterator.hasNext());
     OGremlinResult result = iterator.next();
     Long count = result.getProperty("value");
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
   }
 
   @Test
diff --git a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/gremlintest/OrientGraphProvider.java b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/gremlintest/OrientGraphProvider.java
index 77a86b26..5578144f 100644
--- a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/gremlintest/OrientGraphProvider.java
+++ b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/gremlintest/OrientGraphProvider.java
@@ -121,7 +121,7 @@ public ORID convertId(Object id, Class<? extends Element> c) {
     if (id instanceof String) {
       Integer numericId;
       try {
-        numericId = new Integer(id.toString());
+        numericId = Integer.valueOf(id.toString());
       } catch (NumberFormatException e) {
         return new MockORID("Invalid id: " + id + " for " + c);
       }
diff --git a/server/src/test/java/com/orientechnologies/tinkerpop/OrientGraphExecuteFunctionGraphFactoryTest.java b/server/src/test/java/com/orientechnologies/tinkerpop/OrientGraphExecuteFunctionGraphFactoryTest.java
index 987c0f1c..9d6d20f0 100644
--- a/server/src/test/java/com/orientechnologies/tinkerpop/OrientGraphExecuteFunctionGraphFactoryTest.java
+++ b/server/src/test/java/com/orientechnologies/tinkerpop/OrientGraphExecuteFunctionGraphFactoryTest.java
@@ -65,7 +65,7 @@ public void testExecuteGremlinFunctionCountQueryTest() {
 
     Assert.assertEquals(true, gremlin.hasNext());
     Object result = gremlin.next();
-    Assert.assertEquals(new Long(2), result);
+    Assert.assertEquals(Long.valueOf(2), result);
   }
 
   // Still Not supported
diff --git a/server/src/test/java/com/orientechnologies/tinkerpop/OrientGraphExecuteQueryRemoteGraphFactoryTest.java b/server/src/test/java/com/orientechnologies/tinkerpop/OrientGraphExecuteQueryRemoteGraphFactoryTest.java
index ff6e4ac8..5765e29d 100644
--- a/server/src/test/java/com/orientechnologies/tinkerpop/OrientGraphExecuteQueryRemoteGraphFactoryTest.java
+++ b/server/src/test/java/com/orientechnologies/tinkerpop/OrientGraphExecuteQueryRemoteGraphFactoryTest.java
@@ -44,7 +44,7 @@ public void testExecuteGremlinCountQueryTest() {
     Assert.assertEquals(true, iterator.hasNext());
     OGremlinResult result = iterator.next();
     Long count = result.getProperty("value");
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
   }
 
   @Test
diff --git a/server/src/test/java/com/orientechnologies/tinkerpop/OrientGraphQueryTest.java b/server/src/test/java/com/orientechnologies/tinkerpop/OrientGraphQueryTest.java
index 1f4e173b..2f310761 100644
--- a/server/src/test/java/com/orientechnologies/tinkerpop/OrientGraphQueryTest.java
+++ b/server/src/test/java/com/orientechnologies/tinkerpop/OrientGraphQueryTest.java
@@ -19,38 +19,38 @@ public void shouldCountVerticesEdges() {
 
     // Count on V
     Long count = graph.traversal().V().count().toList().get(0);
-    Assert.assertEquals(new Long(4), count);
+    Assert.assertEquals(Long.valueOf(4), count);
 
     count = graph.traversal().V().hasLabel("Person").count().toList().get(0);
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
 
     count = graph.traversal().V().hasLabel("Animal").count().toList().get(0);
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
 
     count = graph.traversal().V().hasLabel("Animal", "Person").count().toList().get(0);
-    Assert.assertEquals(new Long(4), count);
+    Assert.assertEquals(Long.valueOf(4), count);
 
     // Count on E
 
     count = graph.traversal().E().count().toList().get(0);
-    Assert.assertEquals(new Long(3), count);
+    Assert.assertEquals(Long.valueOf(3), count);
 
     count = graph.traversal().E().hasLabel("HasFriend").count().toList().get(0);
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     count = graph.traversal().E().hasLabel("HasAnimal").count().toList().get(0);
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
 
     count = graph.traversal().E().hasLabel("HasAnimal", "HasFriend").count().toList().get(0);
-    Assert.assertEquals(new Long(3), count);
+    Assert.assertEquals(Long.valueOf(3), count);
 
     // Inverted Count
 
     count = graph.traversal().V().hasLabel("HasFriend").count().toList().get(0);
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     count = graph.traversal().E().hasLabel("Person").count().toList().get(0);
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     // More Complex Count
 
@@ -63,29 +63,29 @@ public void shouldCountVerticesEdges() {
             .count()
             .toList()
             .get(0);
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
 
     // With Polymorphism
 
     count = graph.traversal().V().has("Person", "name", "Jon").out("E").count().toList().get(0);
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
 
     // With Base Class V/E
 
     count = graph.traversal().V().has("name", "Jon").count().toList().get(0);
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     count = graph.traversal().E().has("name", "Jon").count().toList().get(0);
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     count = graph.traversal().V().has("name", "Jon").out("E").count().toList().get(0);
-    Assert.assertEquals(new Long(2), count);
+    Assert.assertEquals(Long.valueOf(2), count);
 
     count = graph.traversal().E().has("marker", 10).count().toList().get(0);
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     count = graph.traversal().V().has("marker", 10).count().toList().get(0);
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
   }
 
   @Test
@@ -96,19 +96,19 @@ public void shouldCountVerticesEdgesOnTXRollback() {
     // Count on V
     Long count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     graph.addVertex("name", "Jon");
 
     count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     graph.tx().rollback();
 
     count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     graph.close();
   }
@@ -121,18 +121,18 @@ public void shouldExecuteTraversalWithSpecialCharacters() {
     // Count on V
     Long count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     graph.addVertex("identifier", 1);
 
     count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     graph.tx().commit();
 
     count = graph.traversal().V().has("~identifier", 1).count().toList().get(0);
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     graph.close();
   }
@@ -148,13 +148,13 @@ public void shouldNotBlowWithWrongClass() {
 
       Integer count = graph.traversal().V().hasLabel("Wrong").toList().size();
 
-      Assert.assertEquals(new Integer(0), count);
+      Assert.assertEquals(Integer.valueOf(0), count);
 
       // Count on Person + Wrong Class
 
       count = graph.traversal().V().hasLabel("Person", "Wrong").toList().size();
 
-      Assert.assertEquals(new Integer(2), count);
+      Assert.assertEquals(Integer.valueOf(2), count);
     } finally {
       graph.close();
     }
@@ -195,19 +195,19 @@ public void shouldCountVerticesEdgesOnTXCommit() {
     // Count on V
     Long count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(0), count);
+    Assert.assertEquals(Long.valueOf(0), count);
 
     graph.addVertex("name", "Jon");
 
     count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     graph.tx().commit();
 
     count = graph.traversal().V().count().toList().get(0);
 
-    Assert.assertEquals(new Long(1), count);
+    Assert.assertEquals(Long.valueOf(1), count);
 
     graph.close();
   }
diff --git a/server/src/test/java/com/orientechnologies/tinkerpop/http/GremlinQueryHttpGraphFactoryTest.java b/server/src/test/java/com/orientechnologies/tinkerpop/http/GremlinQueryHttpGraphFactoryTest.java
index a9ffa7d6..eefd48cd 100644
--- a/server/src/test/java/com/orientechnologies/tinkerpop/http/GremlinQueryHttpGraphFactoryTest.java
+++ b/server/src/test/java/com/orientechnologies/tinkerpop/http/GremlinQueryHttpGraphFactoryTest.java
@@ -58,6 +58,6 @@ public void simpleHttpGremlinCountQuery() throws IOException {
 
     Map next = res.iterator().next();
 
-    Assert.assertEquals(new Long(2).intValue(), next.get("value"));
+    Assert.assertEquals(Long.valueOf(2).intValue(), next.get("value"));
   }
 }