diff --git a/ejb/tests/component-tests/pom.xml b/ejb/tests/component-tests/pom.xml
index 5095a5f8..1c92a26e 100644
--- a/ejb/tests/component-tests/pom.xml
+++ b/ejb/tests/component-tests/pom.xml
@@ -50,9 +50,9 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <extension>true</extension>
-                </configuration>
+                    <configuration>
+		    					<variant>jpa2</variant>
+				</configuration>
             </plugin>
             <plugin>
                 <inherited>true</inherited>
diff --git a/ejb/tests/component-tests/src/main/resources/stream.xsd b/ejb/tests/component-tests/src/main/resources/stream.xsd
index e31a7d39..3b22a85d 100644
--- a/ejb/tests/component-tests/src/main/resources/stream.xsd
+++ b/ejb/tests/component-tests/src/main/resources/stream.xsd
@@ -46,14 +46,22 @@
             <xs:sequence>
             <xs:element name="JobStreamSteps">
                 <xs:complexType>
-                    <!--<xs:annotation>
+			<xs:annotation>
                                      <xs:appinfo>
-                                         <hj:embedded/>
+                                         <hj:embeddable/>
                                      </xs:appinfo>
-                                 </xs:annotation>                       --> <xs:annotation>
                     <xs:documentation>The JobStreamStep element represents a task in a stream.</xs:documentation></xs:annotation>
                     <xs:sequence>
                         <xs:element name="JobStreamStep" maxOccurs="unbounded">
+                            <xs:annotation>
+                                <xs:documentation>Metadata name</xs:documentation>
+                                <xs:appinfo>
+                                    <hj:one-to-many>
+                                        <orm:join-column name="job_stream_dt_hjid"/>
+                                    </hj:one-to-many>
+                                    <!-- end of table name customization -->
+                                </xs:appinfo>
+                            </xs:annotation>
                             <xs:complexType>
                                 <xs:annotation>
                                     <xs:appinfo>