diff --git a/connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/metadata/TestAnnotationMetadataProcessor.java b/connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/metadata/TestAnnotationMetadataProcessor.java
index f8b9be31de..7e2843834e 100644
--- a/connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/metadata/TestAnnotationMetadataProcessor.java
+++ b/connectors/translator-infinispan-dsl/src/test/java/org/teiid/translator/infinispan/dsl/metadata/TestAnnotationMetadataProcessor.java
@@ -1,6 +1,6 @@
 package org.teiid.translator.infinispan.dsl.metadata;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.util.Properties;
 
@@ -42,7 +42,7 @@ public void testPersonMetadata() throws Exception {
 
 		System.out.println("Schema: " + metadataDDL);
 		String expected = "CREATE FOREIGN TABLE Person (\n"
-	    + "\tPersonObject object OPTIONS (NAMEINSOURCE 'this', SELECTABLE FALSE, SEARCHABLE 'Unsearchable', NATIVE_TYPE 'org.jboss.as.quickstarts.datagrid.hotrod.query.domain.Person'),\n"
+	    + "\tPersonObject object OPTIONS (NAMEINSOURCE 'this', SELECTABLE FALSE, UPDATABLE FALSE, SEARCHABLE 'Unsearchable', NATIVE_TYPE 'org.jboss.as.quickstarts.datagrid.hotrod.query.domain.Person'),\n"
 	    + "\tid integer NOT NULL OPTIONS (NAMEINSOURCE 'id', SEARCHABLE 'Searchable', NATIVE_TYPE 'int'),\n"
 	    + "\temail string OPTIONS (NAMEINSOURCE 'email', SEARCHABLE 'Searchable', NATIVE_TYPE 'java.lang.String'),\n"
 	    + "\tname string NOT NULL OPTIONS (NAMEINSOURCE 'name', SEARCHABLE 'Searchable', NATIVE_TYPE 'java.lang.String'),\n"	    
diff --git a/connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestAnnotationMetadataProcessor.java b/connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestAnnotationMetadataProcessor.java
index 66eee1fdb4..a63c3f20a8 100644
--- a/connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestAnnotationMetadataProcessor.java
+++ b/connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestAnnotationMetadataProcessor.java
@@ -1,6 +1,6 @@
 package org.teiid.translator.object.metadata;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.util.Properties;
 
@@ -40,7 +40,6 @@ public void testPersonMetadata() throws Exception {
 		String metadataDDL = DDLStringVisitor.getDDLString(mf.getSchema(),
 				null, null);
 
-		System.out.println("Schema: " + metadataDDL);
 		String expected = "CREATE FOREIGN TABLE Trade (\n"
 	    + "\tTradeObject object OPTIONS (NAMEINSOURCE 'this', SELECTABLE FALSE, UPDATABLE FALSE, SEARCHABLE 'Unsearchable', NATIVE_TYPE 'org.teiid.translator.object.testdata.annotated.Trade'),\n"
 	    + "\ttradeId long NOT NULL OPTIONS (NAMEINSOURCE 'tradeId', SEARCHABLE 'Searchable', NATIVE_TYPE 'long'),\n"	    
diff --git a/connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestPersonMetadataProcessor.java b/connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestPersonMetadataProcessor.java
index ec86a3ceaa..c3f1931744 100644
--- a/connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestPersonMetadataProcessor.java
+++ b/connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestPersonMetadataProcessor.java
@@ -1,6 +1,6 @@
 package org.teiid.translator.object.metadata;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.util.Properties;
 
@@ -40,7 +40,6 @@ public void testPersonMetadata() throws Exception {
 		String metadataDDL = DDLStringVisitor.getDDLString(mf.getSchema(),
 				null, null);
 
-		System.out.println("Schema: " + metadataDDL);
 		String expected =  "CREATE FOREIGN TABLE Person (\n"
 				+ "\tPersonObject object OPTIONS (NAMEINSOURCE 'this', SELECTABLE FALSE, UPDATABLE FALSE, SEARCHABLE 'Unsearchable', NATIVE_TYPE 'org.teiid.translator.object.testdata.person.Person'),\n"
 				+ "\tid integer NOT NULL OPTIONS (NAMEINSOURCE 'id', SEARCHABLE 'Searchable', NATIVE_TYPE 'int'),\n"
diff --git a/connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestTradesMetadataProcessor.java b/connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestTradesMetadataProcessor.java
index dbe6dc0de0..939b94b8ba 100644
--- a/connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestTradesMetadataProcessor.java
+++ b/connectors/translator-object/src/test/java/org/teiid/translator/object/metadata/TestTradesMetadataProcessor.java
@@ -1,6 +1,6 @@
 package org.teiid.translator.object.metadata;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.util.Properties;
 
@@ -40,7 +40,6 @@ public void testTradeMetadata() throws Exception {
 		String metadataDDL = DDLStringVisitor.getDDLString(mf.getSchema(),
 				null, null);
 
-		System.out.println("Schema: " + metadataDDL);
 		String expected =  "CREATE FOREIGN TABLE Trade (\n"
 				+ "\tTradeObject object OPTIONS (NAMEINSOURCE 'this', SELECTABLE FALSE, UPDATABLE FALSE, SEARCHABLE 'Unsearchable', NATIVE_TYPE 'org.teiid.translator.object.testdata.trades.Trade'),\n"
 				+ "\ttradeId long NOT NULL OPTIONS (NAMEINSOURCE 'tradeId', SEARCHABLE 'Searchable', NATIVE_TYPE 'long'),\n"
@@ -68,7 +67,6 @@ public void testTradeMetadataFromVDB() throws Exception {
 		String metadataDDL = DDLStringVisitor.getDDLString(mf.getSchema(),
 				null, null);
 
-		System.out.println("Schema: " + metadataDDL);
 		String expected =  "CREATE FOREIGN TABLE Trade (\n"
 				+ "\tTradeObject object OPTIONS (NAMEINSOURCE 'this', SEARCHABLE 'Unsearchable', NATIVE_TYPE 'org.teiid.translator.object.testdata.trades.Trade'),\n"
 				+ "\ttradeId long NOT NULL OPTIONS (NAMEINSOURCE 'tradeId', SEARCHABLE 'Searchable', NATIVE_TYPE 'long'),\n"
diff --git a/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/person/PersonSchemaVDBUtility.java b/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/person/PersonSchemaVDBUtility.java
index 6e5336cf13..ad77fee4f9 100644
--- a/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/person/PersonSchemaVDBUtility.java
+++ b/connectors/translator-object/src/test/java/org/teiid/translator/object/testdata/person/PersonSchemaVDBUtility.java
@@ -49,7 +49,6 @@ public class PersonSchemaVDBUtility {
 	
 	static {
 		File f = new File(UnitTestUtil.getTestDataPath() + File.separatorChar + "PersonProject" + File.separatorChar + "Person.vdb");
-		System.out.println("TestDataPath " + f.getAbsolutePath());
 		try {
 			TRANSLATION_UTILITY = new TranslationUtility("Person.vdb", f.toURI().toURL());
 		} catch (Throwable e) {