Moving back to Hb 4.1
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties b/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties
index a23bc83..0a40b47 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties
@@ -35,5 +35,5 @@
 teneo.download.area=/home/data/httpd/download.eclipse.org/modeling/emf/teneo
 buckminster.p2.site=http://download.eclipse.org/tools/buckminster/headless-4.2
 director.url=http://download.eclipse.org/tools/buckminster/products/director_latest.zip
-thirdparty.url=http://www.elver.org/eclipse/2.1.0/update/teneotexodeps.zip
+thirdparty.url=http://www.elver.org/eclipse/2.0.0/update/teneotexodeps.zip
 #eclipse.staging.area=${env.HUDSON_HOME}/jobs/${env.JOB_NAME}/signing
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/build/xsl/content2html.xsl b/build/org.eclipse.emf.teneo.releng.buckminster/build/xsl/content2html.xsl
index 1c916a7..5fe86a0 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/build/xsl/content2html.xsl
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/build/xsl/content2html.xsl
@@ -29,7 +29,7 @@
 					<br />
 					Some EMF Teneo plugins require third party drivers from the
 					following update site:
-					<a href="http://www.elver.org/eclipse/2.1.0/update/">Teneo/Texo dependencies</a>
+					<a href="http://www.elver.org/eclipse/2.0.0/update/">Teneo/Texo dependencies</a>
 					.
 					<br />
 					<br />
diff --git a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractActionTest.java b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractActionTest.java
index 4b52911..d39149b 100755
--- a/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractActionTest.java
+++ b/tests/org.eclipse.emf.teneo.commontest/src/org/eclipse/emf/teneo/test/AbstractActionTest.java
@@ -107,7 +107,7 @@
 			allProperties.setProperty(Constants.ANNOTATION_AUDITING_NOT, "true");
 		}
 
-		allProperties.setProperty(PersistenceOptions.HIBERNATE_VERSION, "4.2.7SP1");
+//		allProperties.setProperty(PersistenceOptions.HIBERNATE_VERSION, "4.2.7SP1");
 		
 		// override some defaults
 		if (allProperties.get(PersistenceOptions.SET_DEFAULT_CASCADE_ON_NON_CONTAINMENT) == null) {
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_e_o_hibernate.hbm.xml
index 0521578..b0ff3c0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_e_o_hibernate.hbm.xml
@@ -65,7 +65,7 @@
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_WRITERS_IDX`"/>
-			<many-to-many entity-name="Writer" unique="false" foreign-key="schrijvers">
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_h_o_hibernate.hbm.xml
index 3ab36bc..2cbcad6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVCascadeDeleteAction_hsqldb_h_o_hibernate.hbm.xml
@@ -74,7 +74,7 @@
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_WRITERS_IDX`"/>
-			<many-to-many entity-name="Writer" unique="false" foreign-key="schrijvers">
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_e_o_hibernate.hbm.xml
index 0521578..b0ff3c0 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_e_o_hibernate.hbm.xml
@@ -65,7 +65,7 @@
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_WRITERS_IDX`"/>
-			<many-to-many entity-name="Writer" unique="false" foreign-key="schrijvers">
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_h_o_hibernate.hbm.xml
index 3ab36bc..2cbcad6 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/EAVMappingAction_hsqldb_h_o_hibernate.hbm.xml
@@ -74,7 +74,7 @@
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`LIBRARY_WRITERS_IDX`"/>
-			<many-to-many entity-name="Writer" unique="false" foreign-key="schrijvers">
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_e_o_hibernate.hbm.xml
index 9446e90..8631c85 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_e_o_hibernate.hbm.xml
@@ -80,7 +80,7 @@
 				<column name="`RIGHTCOLUMN`" unique="false"/>
 			</key>
 			<list-index column="`HOUSE_VISITORS_IDX`"/>
-			<many-to-many entity-name="Person" unique="false" foreign-key="HOUSE_VISITORS">
+			<many-to-many entity-name="Person" unique="true" foreign-key="HOUSE_VISITORS">
 				<column name="`PERSON_FIRSTNAME`" unique="false"/>
 				<column name="`PERSON_LASTNAME`" unique="false"/>
 			</many-to-many>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_h_o_hibernate.hbm.xml
index 89e6ea3..f8b9851 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.annotations/JoinColumnsTest$1_hsqldb_h_o_hibernate.hbm.xml
@@ -78,7 +78,7 @@
 				<column name="`RIGHTCOLUMN`" unique="false"/>
 			</key>
 			<list-index column="`HOUSE_VISITORS_IDX`"/>
-			<many-to-many entity-name="Person" unique="false" foreign-key="HOUSE_VISITORS">
+			<many-to-many entity-name="Person" unique="true" foreign-key="HOUSE_VISITORS">
 				<column name="`PERSON_FIRSTNAME`" unique="false"/>
 				<column name="`PERSON_LASTNAME`" unique="false"/>
 			</many-to-many>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
index 0e6057a..7373b0f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_e_o_hibernate.hbm.xml
@@ -36,7 +36,7 @@
 				<column name="`EMPLOYEE_ADDR_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSON_ADDRESS_IDX`"/>
-			<many-to-many entity-name="Address" unique="false" foreign-key="EMPLOYEE_ADDRESS"/>
+			<many-to-many entity-name="Address" unique="true" foreign-key="EMPLOYEE_ADDRESS"/>
 		</list>
 		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`DEPARTMENT`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
index 79c5987..2734a8a 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.jpa2/JPA2AssociationOverrideAction_hsqldb_h_o_hibernate.hbm.xml
@@ -42,7 +42,7 @@
 				<column name="`EMPLOYEE_ADDR_ID`" unique="false"/>
 			</key>
 			<list-index column="`PERSON_ADDRESS_IDX`"/>
-			<many-to-many entity-name="Address" unique="false" foreign-key="EMPLOYEE_ADDRESS"/>
+			<many-to-many entity-name="Address" unique="true" foreign-key="EMPLOYEE_ADDRESS"/>
 		</list>
 		<property name="department" lazy="false" insert="true" update="true" not-null="true" unique="false" type="java.lang.String">
 			<column not-null="true" unique="false" name="`DEPARTMENT`"/>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_e_o_hibernate.hbm.xml
index 455f1c6..93dccdb 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_e_o_hibernate.hbm.xml
@@ -56,7 +56,7 @@
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`TEST_INDEX`"/>
-			<many-to-many entity-name="Writer" unique="false" foreign-key="schrijvers">
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
@@ -86,7 +86,7 @@
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`WRITER_BOOKS_IDX`"/>
-			<many-to-many entity-name="Book" unique="false">
+			<many-to-many entity-name="Book" unique="true">
 				<column name="`BOOK_TITLE`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_h_o_hibernate.hbm.xml
index 85c4184..41e70d9 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.emf.sample/LibraryExtraLazyJoinMoreAction_hsqldb_h_o_hibernate.hbm.xml
@@ -62,7 +62,7 @@
 				<column name="`LIBRARY_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`TEST_INDEX`"/>
-			<many-to-many entity-name="Writer" unique="false" foreign-key="schrijvers">
+			<many-to-many entity-name="Writer" unique="true" foreign-key="schrijvers">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
@@ -95,7 +95,7 @@
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`WRITER_BOOKS_IDX`"/>
-			<many-to-many entity-name="Book" unique="false">
+			<many-to-many entity-name="Book" unique="true">
 				<column name="`BOOK_TITLE`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_e_o_hibernate.hbm.xml
index 34578f1..8194245 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_e_o_hibernate.hbm.xml
@@ -17,7 +17,7 @@
 				<column name="`BAR_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`BAR_FOO_IDX`"/>
-			<many-to-many entity-name="Foo" unique="false" foreign-key="BAR_FOO">
+			<many-to-many entity-name="Foo" unique="true" foreign-key="BAR_FOO">
 				<column name="`FOO_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_h_o_hibernate.hbm.xml
index c136669..b03d1f1 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz391134Action_hsqldb_h_o_hibernate.hbm.xml
@@ -20,7 +20,7 @@
 				<column name="`BAR_E_ID`" unique="false"/>
 			</key>
 			<list-index column="`BAR_FOO_IDX`"/>
-			<many-to-many entity-name="Foo" unique="false" foreign-key="BAR_FOO">
+			<many-to-many entity-name="Foo" unique="true" foreign-key="BAR_FOO">
 				<column name="`FOO_E_ID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_e_o_hibernate.hbm.xml
index 7e7e911..58aad1f 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_e_o_hibernate.hbm.xml
@@ -16,7 +16,7 @@
 				<column name="`CASE1_BDSID`" unique="false"/>
 			</key>
 			<list-index column="`CASE1_CASE2_IDX`"/>
-			<many-to-many entity-name="com.example.robtest.Case2" unique="false" foreign-key="CASE1_CASE2">
+			<many-to-many entity-name="com.example.robtest.Case2" unique="true" foreign-key="CASE1_CASE2">
 				<column name="`CASE2_BDSID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_h_o_hibernate.hbm.xml
index 8bade3d..3835295 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.hibernate.test.issues/Bz400088Action_hsqldb_h_o_hibernate.hbm.xml
@@ -19,7 +19,7 @@
 				<column name="`CASE1_BDSID`" unique="false"/>
 			</key>
 			<list-index column="`CASE1_CASE2_IDX`"/>
-			<many-to-many entity-name="com.example.robtest.Case2" unique="false" foreign-key="CASE1_CASE2">
+			<many-to-many entity-name="com.example.robtest.Case2" unique="true" foreign-key="CASE1_CASE2">
 				<column name="`CASE2_BDSID`" unique="false"/>
 			</many-to-many>
 		</list>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_e_o_hibernate.hbm.xml
index 58d27a8..dc0aa1b 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_e_o_hibernate.hbm.xml
@@ -87,7 +87,7 @@
 			<key update="true">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</key>
-			<many-to-many entity-name="Book" unique="false">
+			<many-to-many entity-name="Book" unique="true">
 				<column name="`BOOK_TITLE`" unique="false"/>
 			</many-to-many>
 		</bag>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_h_o_hibernate.hbm.xml
index 631cae3..a1eece8 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.emf.sample/LibraryJoinTableNamingAction_hsqldb_h_o_hibernate.hbm.xml
@@ -96,7 +96,7 @@
 			<key update="true">
 				<column name="`WRITER_E_ID`" unique="false"/>
 			</key>
-			<many-to-many entity-name="Book" unique="false">
+			<many-to-many entity-name="Book" unique="true">
 				<column name="`BOOK_TITLE`" unique="false"/>
 			</many-to-many>
 		</bag>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_e_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_e_o_hibernate.hbm.xml
index 2b9d001..0fbabb4 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_e_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_e_o_hibernate.hbm.xml
@@ -16,7 +16,7 @@
 			<key update="true">
 				<column name="`ONE_E_ID`" unique="false"/>
 			</key>
-			<many-to-many entity-name="Many" unique="false">
+			<many-to-many entity-name="Many" unique="true">
 				<column name="`MANY_E_ID`" unique="false"/>
 			</many-to-many>
 		</bag>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_h_o_hibernate.hbm.xml b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_h_o_hibernate.hbm.xml
index b4dbdf8..8d5abff 100644
--- a/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_h_o_hibernate.hbm.xml
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/hbm/org.eclipse.emf.teneo.test.issues/BZ237361Action_hsqldb_h_o_hibernate.hbm.xml
@@ -19,7 +19,7 @@
 			<key update="true">
 				<column name="`ONE_E_ID`" unique="false"/>
 			</key>
-			<many-to-many entity-name="Many" unique="false">
+			<many-to-many entity-name="Many" unique="true">
 				<column name="`MANY_E_ID`" unique="false"/>
 			</many-to-many>
 		</bag>
diff --git a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java
index 61a246a..8b87d69 100755
--- a/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java
+++ b/tests/org.eclipse.emf.teneo.hibernate.test/src/org/eclipse/emf/teneo/hibernate/test/emf/sample/AllTests.java
@@ -62,6 +62,11 @@
 		TestSuite suite = new MultiCfgTestSuite(
 				"Test for org.eclipse.emf.teneo.hibernate.test.emf.sample", HibernateTestbed.instance()
 						.getConfigurations());
+		// if (true) {
+		// suite.addTestSuite(LibraryExtraLazyMoreAction.class);
+		// return suite;
+		// }
+
 		suite.addTestSuite(EfficientSizeTestAction.class);
 		suite.addTestSuite(LibraryTest.class);
 		suite.addTestSuite(LibraryEAVAction.class);