diff --git a/jpa/employee/employee.web-js/src/main/webapp/WEB-INF/lib/org.eclipse.persistence.jpars-2.4.2-SNAPSHOT.jar b/jpa/employee/employee.web-js/src/main/webapp/WEB-INF/lib/org.eclipse.persistence.jpars-2.4.2-SNAPSHOT.jar
deleted file mode 100644
index 66a062d..0000000
--- a/jpa/employee/employee.web-js/src/main/webapp/WEB-INF/lib/org.eclipse.persistence.jpars-2.4.2-SNAPSHOT.jar
+++ /dev/null
Binary files differ
diff --git a/jpa/polyglot/polyglot.client/.classpath b/jpa/polyglot/polyglot.client/.classpath
index 2dd4731..f619a53 100644
--- a/jpa/polyglot/polyglot.client/.classpath
+++ b/jpa/polyglot/polyglot.client/.classpath
@@ -6,6 +6,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
diff --git a/jpa/polyglot/polyglot.composite/.classpath b/jpa/polyglot/polyglot.composite/.classpath
index 6c4902d..d06f398 100644
--- a/jpa/polyglot/polyglot.composite/.classpath
+++ b/jpa/polyglot/polyglot.composite/.classpath
@@ -5,14 +5,26 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
 		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jpa/polyglot/polyglot.composite/.project b/jpa/polyglot/polyglot.composite/.project
index e0dfaf8..cc8271e 100644
--- a/jpa/polyglot/polyglot.composite/.project
+++ b/jpa/polyglot/polyglot.composite/.project
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
diff --git a/jpa/polyglot/polyglot.composite/src/main/resources/META-INF/persistence.xml b/jpa/polyglot/polyglot.composite/src/main/resources/META-INF/persistence.xml
index 39b904b..41fe47a 100644
--- a/jpa/polyglot/polyglot.composite/src/main/resources/META-INF/persistence.xml
+++ b/jpa/polyglot/polyglot.composite/src/main/resources/META-INF/persistence.xml
@@ -4,8 +4,8 @@
 	version="2.0">
 	<persistence-unit name="composite-pu" transaction-type="RESOURCE_LOCAL">
 		<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-		<jar-file>relational-pu.jar</jar-file>
-		<jar-file>nosql-pu.jar</jar-file>
+		<jar-file>polyglot.relational.jar</jar-file>
+		<jar-file>polyglot.nosql.jar</jar-file>
 		<properties>
 			<property name="eclipselink.composite-unit" value="true" />
 			<property name="eclipselink.logging.level" value="FINE" />
diff --git a/jpa/polyglot/polyglot.relational/.classpath b/jpa/polyglot/polyglot.relational/.classpath
index 517e18a..698778f 100644
--- a/jpa/polyglot/polyglot.relational/.classpath
+++ b/jpa/polyglot/polyglot.relational/.classpath
@@ -11,14 +11,20 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
+			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jpa/polyglot/polyglot.relational/.project b/jpa/polyglot/polyglot.relational/.project
index 1ff68e9..2007455 100644
--- a/jpa/polyglot/polyglot.relational/.project
+++ b/jpa/polyglot/polyglot.relational/.project
@@ -16,12 +16,12 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>