diff --git a/rules/rules-reviewed/eap8/eap6/tests/data/faces/pom.xml b/rules/rules-reviewed/eap8/eap6/tests/data/faces/pom.xml
index bc8c55c28..39c86ae83 100644
--- a/rules/rules-reviewed/eap8/eap6/tests/data/faces/pom.xml
+++ b/rules/rules-reviewed/eap8/eap6/tests/data/faces/pom.xml
@@ -5,6 +5,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>faces-test</artifactId>
+    <groupId>org.faces.test</groupId>
+    <version>0.0.1-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>faces-test</name>
     <description>This project imports faces dependencies</description>
@@ -21,11 +23,13 @@
         <dependency>
             <groupId>org.jboss.spec.javax.faces</groupId>
             <artifactId>jboss-jsf-api_2.3_spec</artifactId>
+            <version>3.1.0.SP02</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.faces</groupId>
             <artifactId>jsf-api</artifactId>
+            <version>2.1</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/rules/rules-reviewed/eap8/eap6/tests/data/resteasy/pom.xml b/rules/rules-reviewed/eap8/eap6/tests/data/resteasy/pom.xml
index 63544a40a..12343ff05 100644
--- a/rules/rules-reviewed/eap8/eap6/tests/data/resteasy/pom.xml
+++ b/rules/rules-reviewed/eap8/eap6/tests/data/resteasy/pom.xml
@@ -1,33 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-    JBoss, Home of Professional Open Source
-    Copyright 2015, Red Hat, Inc. and/or its affiliates, and individual
-    contributors by the @authors tag. See the copyright.txt in the
-    distribution for a full listing of individual contributors.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-    http://www.apache.org/licenses/LICENSE-2.0
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.jboss.eap.quickstarts</groupId>
-        <artifactId>quickstart-parent</artifactId>
-        <!--
-        Maintain separation between the artifact id and the version to help prevent
-        merge conflicts between commits changing the GA and those changing the V.
-        -->
-        <version>7.4.0.GA</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
+<!--    <parent>-->
+<!--        <groupId>org.jboss.eap.quickstarts</groupId>-->
+<!--        <artifactId>quickstart-parent</artifactId>-->
+<!--        &lt;!&ndash;-->
+<!--        Maintain separation between the artifact id and the version to help prevent-->
+<!--        merge conflicts between commits changing the GA and those changing the V.-->
+<!--        &ndash;&gt;-->
+<!--        <version>7.4.0.GA</version>-->
+<!--        <relativePath>../pom.xml</relativePath>-->
+<!--    </parent>-->
 
+    <groupId>org.jboss.eap</groupId>
+    <version>0.0.1-SNAPSHOT</version>
     <artifactId>spring-resteasy</artifactId>
     <packaging>war</packaging>
     <name>Quickstart: spring-resteasy</name>
@@ -64,30 +50,36 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <version>3.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
+            <version>4.0.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
+            <version>3.15.1.Final</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-spring</artifactId>
+            <version>3.15.6.Final</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jettison-provider</artifactId>
+            <version>3.7.0.Final</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-yaml-provider</artifactId>
+            <version>3.15.0.Final</version>
         </dependency>
 
 
@@ -95,16 +87,19 @@
         <dependency>
             <groupId>org.jboss.spec.javax.servlet</groupId>
             <artifactId>jboss-servlet-api_4.0_spec</artifactId>
+            <version>2.0.0.Final</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
             <artifactId>jboss-jsp-api_2.3_spec</artifactId>
+            <version>1.0.3.Final</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.ws.rs</groupId>
             <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+            <version>2.0.1.Final</version>
             <scope>provided</scope>
         </dependency>
 
@@ -112,19 +107,23 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
+            <version>3.1.0.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
+            <version>3.1.0.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.junit</groupId>
             <artifactId>arquillian-junit-container</artifactId>
+            <version>1.6.0.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap.resolver</groupId>
             <artifactId>shrinkwrap-resolver-depchain</artifactId>
+            <version>3.1.4</version>
             <type>pom</type>
             <scope>test</scope>
         </dependency>
diff --git a/rules/rules-reviewed/eap8/eap6/tests/data/xml-binding/pom.xml b/rules/rules-reviewed/eap8/eap6/tests/data/xml-binding/pom.xml
index 0261185a7..fa2539edf 100644
--- a/rules/rules-reviewed/eap8/eap6/tests/data/xml-binding/pom.xml
+++ b/rules/rules-reviewed/eap8/eap6/tests/data/xml-binding/pom.xml
@@ -3,11 +3,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>jaxb-test</artifactId>
     <packaging>war</packaging>
     <name>jaxb-test</name>
     <description>This project imports jaxb dependencies</description>
+    
+    <groupId>org.test</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+    <artifactId>jaxb-test</artifactId>
 
     <licenses>
         <license>
diff --git a/rules/rules-reviewed/eap8/eap7/hibernate-search.windup.xml b/rules/rules-reviewed/eap8/eap7/hibernate-search.windup.xml
index 460c6c310..ecae02928 100644
--- a/rules/rules-reviewed/eap8/eap7/hibernate-search.windup.xml
+++ b/rules/rules-reviewed/eap8/eap7/hibernate-search.windup.xml
@@ -1347,8 +1347,8 @@
         <rule id="hibernate-search-00960">
             <when>
                 <or>
-                    <javaclass references="org.hibernate.search.{*}Facet{*}"/>
-                    <javaclass references="org.hibernate.search.{*}facet{*}"/>
+                    <javaclass references="org.hibernate.search.{*}.Facet{*}"/>
+                    <javaclass references="org.hibernate.search.{*}.facet{*}"/>
                 </or>
             </when>
             <perform>
@@ -1363,8 +1363,8 @@
         <rule id="hibernate-search-00970">
             <when>
                 <or>
-                    <javaclass references="org.hibernate.search.{*}ErrorHandl{*}"/>
-                    <javaclass references="org.hibernate.search.{*}errorhandl{*}"/>
+                    <javaclass references="org.hibernate.search.{*}.ErrorHandl{*}"/>
+                    <javaclass references="org.hibernate.search.{*}.errorhandl{*}"/>
                 </or>
             </when>
             <perform>
@@ -1429,7 +1429,7 @@
         
         <rule id="hibernate-search-01010">
             <when>
-                <javaclass references="org.hibernate.search.{*}SearchFactory"/>
+                <javaclass references="org.hibernate.search.{*}.SearchFactory"/>
             </when>
             <perform>
                 <hint title="SearchFactory is no longer available" category-id="mandatory" effort="3">
diff --git a/rules/rules-reviewed/eap8/eap7/tests/data/dependencies/pom.xml b/rules/rules-reviewed/eap8/eap7/tests/data/dependencies/pom.xml
index 1512cd489..cad197950 100644
--- a/rules/rules-reviewed/eap8/eap7/tests/data/dependencies/pom.xml
+++ b/rules/rules-reviewed/eap8/eap7/tests/data/dependencies/pom.xml
@@ -1,158 +1,191 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.eap</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+    <artifactId>spring-resteasy</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.glassfish</groupId>
             <artifactId>javax.faces</artifactId>
+            <version>2.4.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
+            <version>8.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-web-api</artifactId>
+            <version>8.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.activation</groupId>
             <artifactId>javax.activation-api</artifactId>
+            <version>1.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.batch</groupId>
             <artifactId>javax.batch-api</artifactId>
+            <version>1.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.ejb</groupId>
             <artifactId>javax.ejb-api</artifactId>
+            <version>3.2.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.el</groupId>
             <artifactId>javax.el-api</artifactId>
+            <version>3.0.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.enterprise.concurrent</groupId>
             <artifactId>javax.enterprise.concurrent-api</artifactId>
+            <version>1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.enterprise.deploy</groupId>
             <artifactId>javax.enterprise.deploy-api</artifactId>
+            <version>1.7</version>
             <scope>provided</scope>
         </dependency>        
         <dependency>
             <groupId>javax.faces</groupId>
             <artifactId>javax.faces-api</artifactId>
+            <version>2.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.interceptor</groupId>
             <artifactId>javax.interceptor-api</artifactId>
+            <version>3.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.jms</groupId>
             <artifactId>javax.jms-api</artifactId>
+            <version>2.0.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.jws</groupId>
             <artifactId>javax.jws-api</artifactId>
+            <version>1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>javax.mail-api</artifactId>
+            <version>1.6.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.management.j2ee</groupId>
             <artifactId>javax.management.j2ee-api</artifactId>
+            <version>1.1.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.resource</groupId>
             <artifactId>javax.resource-api</artifactId>
+            <version>1.7</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.security-auth-message</groupId>
-            <artifactId>javax.security-auth-message-api</artifactId>
+            <groupId>javax.security.auth.message</groupId>
+            <artifactId>javax.security.auth.message-api</artifactId>
+            <version>1.1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.security-jacc</groupId>
-            <artifactId>javax.security-jacc-api</artifactId>
+            <groupId>javax.security.jacc</groupId>
+            <artifactId>javax.security.jacc-api</artifactId>
+            <version>1.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>javax.servlet.jsp-api</artifactId>
+            <version>2.3.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet.jsp.jstl</groupId>
             <artifactId>javax.servlet.jsp.jstl-api</artifactId>
+            <version>1.2.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.transaction</groupId>
             <artifactId>javax.transaction-api</artifactId>
+            <version>1.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.websocket</groupId>
             <artifactId>javax.websocket-api</artifactId>
+            <version>1.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
+            <version>2.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.xml.registry</groupId>
             <artifactId>javax.xml.registry-api</artifactId>
+            <version>1.0.8</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.xml.rpc</groupId>
             <artifactId>javax.xml.rpc-api</artifactId>
+            <version>1.1.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.xml.soap</groupId>
             <artifactId>javax.xml.soap-api</artifactId>
+            <version>1.4.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.xml.ws</groupId>
-            <artifactId>javax.xml.ws-api</artifactId>
-            <scope>provided</scope>
+            <artifactId>jaxws-api</artifactId>
+            <version>2.3.1</version>
         </dependency>
+
     </dependencies>
 
 </project>
diff --git a/rules/rules-reviewed/eap8/eap7/tests/data/jboss-dependencies/pom.xml b/rules/rules-reviewed/eap8/eap7/tests/data/jboss-dependencies/pom.xml
index afb1735c1..9fea29017 100644
--- a/rules/rules-reviewed/eap8/eap7/tests/data/jboss-dependencies/pom.xml
+++ b/rules/rules-reviewed/eap8/eap7/tests/data/jboss-dependencies/pom.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.eap</groupId>
+    <version>0.0.1-SNAPSHOT</version>
+    <artifactId>test-artifact</artifactId>
 
     <properties>
         <version.bom>1.0.1.Final</version.bom>
@@ -12,7 +15,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>jboss-eap-jakartaee8</artifactId>
-                <version>${version.bom}</version>
+                <version>7.3.4.GA</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -20,7 +23,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>jboss-eap-jakartaee8-with-tools</artifactId>
-                <version>${version.bom}</version>
+                <version>7.3.1.GA</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -28,14 +31,14 @@
             <dependency>
                 <groupId>org.jboss.spec</groupId>
                 <artifactId>jboss-jakartaee-8.0</artifactId>
-                <version>${version.bom}</version>
+                <version>1.0.1.Final</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec</groupId>
                 <artifactId>jboss-jakartaee-web-8.0</artifactId>
-                <version>${version.bom}</version>
+                <version>1.0.0.Final</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -43,7 +46,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>eap-runtime-artifacts</artifactId>
-                <version>${version.bom}</version>
+                <version>7.3.1.GA</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -51,7 +54,7 @@
             <dependency>
                 <groupId>org.jboss.bom</groupId>
                 <artifactId>wildfly-ejb-client-legacy-bom</artifactId>
-                <version>${version.bom}</version>
+                <version>26.1.3.Final</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -62,102 +65,127 @@
             <dependency>
                 <groupId>com.sun.activation</groupId>
                 <artifactId>jakarta.activation</artifactId>
+                <version>1.2.2</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.annotation</groupId>
                 <artifactId>jboss-annotations-api_1.3_spec</artifactId>
+                <version>1.0.0.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.security.auth.message</groupId>
                 <artifactId>jboss-jaspi-api_1.0_spec</artifactId>
+                <version>1.0.1.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.security.jacc</groupId>
                 <artifactId>jboss-jacc-api_1.5_spec</artifactId>
+                <version>1.0.2.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.batch</groupId>
                 <artifactId>jboss-batch-api_1.0_spec</artifactId>
+                <version>1.0.1.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.ejb</groupId>
                 <artifactId>jboss-ejb-api_3.2_spec</artifactId>
+                <version>2.0.0.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.el</groupId>
                 <artifactId>jboss-el-api_3.0_spec</artifactId>
+                <version>2.0.0.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.enterprise.concurrent</groupId>
                 <artifactId>jboss-concurrency-api_1.0_spec</artifactId>
+                <version>1.0.1.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.faces</groupId>
                 <artifactId>jboss-jsf-api_2.3_spec</artifactId>
+                <version>3.1.0.SP02</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.interceptor</groupId>
                 <artifactId>jboss-interceptors-api_1.2_spec</artifactId>
+                <version>1.0.1.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.jms</groupId>
                 <artifactId>jboss-jms-api_2.0_spec</artifactId>
+                <version>2.0.0.Final</version>
             </dependency>
             <dependency>
                 <groupId>com.sun.mail</groupId>
                 <artifactId>jakarta.mail</artifactId>
+                <version>1.6.6</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.resource</groupId>
                 <artifactId>jboss-connector-api_1.7_spec</artifactId>
+                <version>1.0.1.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.servlet</groupId>
                 <artifactId>jboss-servlet-api_4.0_spec</artifactId>
+                <version>1.0.0.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
                 <artifactId>jboss-jsp-api_2.3_spec</artifactId>
+                <version>2.0.0.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.taglibs</groupId>
                 <artifactId>taglibs-standard-spec</artifactId>
+                <version>1.2.5</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.transaction</groupId>
                 <artifactId>jboss-transaction-api_1.3_spec</artifactId>
+                <version>2.0.0.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.xml.bind</groupId>
                 <artifactId>jboss-jaxb-api_2.3_spec</artifactId>
+                <version>2.0.0.Final</version>
             </dependency>
             <dependency>
                 <groupId>javax.jws</groupId>
                 <artifactId>jsr181-api</artifactId>
+                <version>1.0-MR1</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.xml.ws</groupId>
                 <artifactId>jboss-jaxws-api_2.3_spec</artifactId>
+                <version>2.0.0.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.websocket</groupId>
                 <artifactId>jboss-websocket-api_1.1_spec</artifactId>
+                <version>2.0.0.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.ws.rs</groupId>
                 <artifactId>jboss-jaxrs-api_2.1_spec</artifactId>
+                <version>2.0.1.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.xml.soap</groupId>
                 <artifactId>jboss-saaj-api_1.4_spec</artifactId>
+                <version>1.0.2.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-core</artifactId>
+                <version>5.4.32.Final</version>
             </dependency>
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-jpamodelgen</artifactId>
+                <version>5.3.20.Final</version>
             </dependency>
       </dependencies>
 </project>
diff --git a/rules/rules-reviewed/eap8/eap7/tests/data/packages/CompleteDukeApplication.java b/rules/rules-reviewed/eap8/eap7/tests/data/packages/CompleteDukeApplication.java
new file mode 100644
index 000000000..60a5dc392
--- /dev/null
+++ b/rules/rules-reviewed/eap8/eap7/tests/data/packages/CompleteDukeApplication.java
@@ -0,0 +1,30 @@
+package eu.agilejava.dukes;
+
+import javax.activation;
+import javax.annotation.*;
+import javax.batch.*;
+import javax.decorator;
+import javax.ejb.*;
+import javax.el;
+import javax.enterprise.*;
+import javax.faces.*;
+import javax.inject;
+import javax.interceptor;
+import javax.jms;
+import javax.json.*;
+import javax.jws.*;
+import javax.mail.*;
+import javax.persistence.*;
+import javax.resource.*;
+import javax.security.*;
+import javax.servlet.*;
+import javax.transaction;
+import javax.validation.*;
+import javax.websocket.*;
+import javax.ws.*;
+import javax.xml.*;
+
+
+@ApplicationPath("")
+public class CompleteDukeApplication extends Application {
+}
diff --git a/rules/rules-reviewed/eap8/eap7/tests/javaee-to-jakarta-namespaces.windup.test.xml b/rules/rules-reviewed/eap8/eap7/tests/javaee-to-jakarta-namespaces.windup.test.xml
index b2e178d03..51ca9fa23 100644
--- a/rules/rules-reviewed/eap8/eap7/tests/javaee-to-jakarta-namespaces.windup.test.xml
+++ b/rules/rules-reviewed/eap8/eap7/tests/javaee-to-jakarta-namespaces.windup.test.xml
@@ -10,7 +10,7 @@
             <rule id="javaee-to-jakarta-namespaces-00001-test">
                 <when>
                     <not>
-                        <iterable-filter size="72">
+                        <iterable-filter size="70">
                             <hint-exists message="Replace `http://xmlns.jcp.org/xml/ns/javaee`"/>
                         </iterable-filter>
                     </not>
diff --git a/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-dependencies.windup.test.xml b/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-dependencies.windup.test.xml
index b7258e299..ec98b1759 100644
--- a/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-dependencies.windup.test.xml
+++ b/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-dependencies.windup.test.xml
@@ -3,7 +3,7 @@
           xmlns="http://windup.jboss.org/schema/jboss-ruleset"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://windup.jboss.org/schema/jboss-ruleset http://windup.jboss.org/schema/jboss-ruleset/windup-jboss-ruleset.xsd">
-    <testDataPath>data/dependencies/pom.xml</testDataPath>
+    <testDataPath>data/dependencies</testDataPath>
     <rulePath>../javax-to-jakarta-dependencies.windup.xml</rulePath>
     <ruleset>
         <rules>
@@ -23,7 +23,7 @@
             <rule id="javax-to-jakarta-dependencies-00002-test">
                 <when>
                     <not>
-                        <iterable-filter size="26">  
+                        <iterable-filter size="25">  
                             <hint-exists message="Update artifact dependency by replacing the `javax."/>
                         </iterable-filter>
                     </not>
diff --git a/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-package.windup.test.xml b/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-package.windup.test.xml
index 0621f4c44..9baa3d89c 100644
--- a/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-package.windup.test.xml
+++ b/rules/rules-reviewed/eap8/eap7/tests/javax-to-jakarta-package.windup.test.xml
@@ -3,14 +3,14 @@
           xmlns="http://windup.jboss.org/schema/jboss-ruleset"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://windup.jboss.org/schema/jboss-ruleset http://windup.jboss.org/schema/jboss-ruleset/windup-jboss-ruleset.xsd">
-    <testDataPath>data</testDataPath>
+    <testDataPath>data/packages</testDataPath>
     <rulePath>../javax-to-jakarta-package.windup.xml</rulePath>
     <ruleset>
         <rules>
             <rule id="javax-to-jakarta-import-00001-test">
                 <when>
                     <not>
-                        <iterable-filter size="42">
+                        <iterable-filter size="23">
                             <hint-exists message="Replace the `javax."/>
                         </iterable-filter>
                     </not>
diff --git a/rules/rules-reviewed/eap8/eap7/tests/jboss-dependencies.windup.test.xml b/rules/rules-reviewed/eap8/eap7/tests/jboss-dependencies.windup.test.xml
index 20a5b0e25..3712fc692 100644
--- a/rules/rules-reviewed/eap8/eap7/tests/jboss-dependencies.windup.test.xml
+++ b/rules/rules-reviewed/eap8/eap7/tests/jboss-dependencies.windup.test.xml
@@ -3,7 +3,7 @@
           xmlns="http://windup.jboss.org/schema/jboss-ruleset"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://windup.jboss.org/schema/jboss-ruleset http://windup.jboss.org/schema/jboss-ruleset/windup-jboss-ruleset.xsd">
-    <testDataPath>data/jboss-dependencies/pom.xml</testDataPath>
+    <testDataPath>data/jboss-dependencies</testDataPath>
     <rulePath>../jboss-dependencies.windup.xml</rulePath>
     <ruleset>
         <rules>