diff --git a/README.md b/README.md
index 478875d6..0490b971 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,38 @@
-# Project
+# Azure Migrate application and code assessment for Java
 
-> This repo has been populated by an initial template to help get you started. Please
-> make sure to update the content to build a great experience for community-building.
+This project holds the rules used by Azure Migrate application and code assessment toolkit. For more information on this product, visit [aka.ms/appcat/java](https://aka.ms/appcat/java).
 
-As the maintainer of this project, please make a few updates:
+## Rulesets
 
-- Improving this README.MD file to provide a great experience
-- Updating SUPPORT.MD with content about this project's support experience
-- Understanding the security reporting process in SECURITY.MD
-- Remove this section from the README
+For details on how to develop and/or contribute rules, visit the [Rules Development Guide](https://azure.github.io/appcat-docs/rules-development-guide/).
+
+## Directory structure
+
+The `rules` repository is organized in subdirectories:
+
+* `rules-reviewed`: this is where you can make contribution and add new rules
+* `rules-generated`: these rules are automatically generated (from the Quarkus main git repo) and you should not add new rules here
+* `rules-overridden-azure`: this is where you can override existing rules (mostly the ones under `rules-reviewed`)
+
+## Testing
+
+Tests may include vulnerable code, bad practices, hardcoded passwords, and more. Please do not report security issues related to code in the tests folders.
+
+To limit the XML-based tests (`windup.test.xml`) which are run, use `-DrunTestsMatching=...`.
+The value can be any part of the test filename to match. Like, `-DrunTestsMatching=hsearch`.
+
+By default, when executing the tests, the `href` attributes of the `<link>` tags are also tested. This means that there is an external request to each URL. 
+If you want to avoid this, you can use the `-Dtest=WindupRulesTest` flag in conjunction with the `-f` flag:
+
+```
+mvn clean test -f rules -Dtest=WindupRulesTest -DrunTestsMatching=hsearch
+```
+
+## Building from source
+
+Ensure you use the provided Maven Wrapper utility to build the project, as Windup requires Maven 3.8.8:
+
+        ./mvnw verify
 
 ## Contributing
 
@@ -32,39 +56,3 @@ trademarks or logos is subject to and must follow
 Use of Microsoft trademarks or logos in modified versions of this project must not cause confusion or imply Microsoft sponsorship.
 Any use of third-party trademarks or logos are subject to those third-party's policies.
 
-Windup Rulesets
-===============
-
-Rules and rulesets contributed by community.
-
-Follow the [Get Involved](https://github.com/windup/windup/wiki/Get-Involved) in Windup wiki.
-
-
-Directory structure
------------
-
-The `rules` module repository is organized in subdirectories:
-
-* `rules-reviewed`: this is where you can make contribution and add new rules
-* `rules-generated`: these rules are automatically generated (from the Quarkus main git repo) and you should not add new rules here
-* `rules-overridden-azure`: this is where you can override existing rules (mostly the ones under `rules-reviewed`)
-
-Testing the rules
------------
-
-To limit the XML-based tests (`windup.test.xml`) which are run, use `-DrunTestsMatching=...`.
-The value can be any part of the test filename to match. Like, `-DrunTestsMatching=hsearch`.
-
-By default, when executing the tests, the `href` attributes of the `<link>` tags are also tested. This means that there is an external request to each URL. 
-If you want to avoid this, you can use the `-Dtest=WindupRulesTest` flag in conjunction with the `-f` flag:
-
-```
-mvn clean test -f rules -Dtest=WindupRulesTest -DrunTestsMatching=hsearch
-```
-
-Building from source
------------
-
-Ensure you use the provided Maven Wrapper utility to build the project, as Windup requires Maven 3.8.8:
-
-        ./mvnw verify
diff --git a/pom.xml b/pom.xml
index 17f3aa72..88c185c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>net.lingala.zip4j</groupId>
+                <artifactId>zip4j</artifactId>
+                <version>2.11.5</version> <!-- Override transitive dependency. -->
+            </dependency>
         </dependencies>
     </dependencyManagement>
-
 </project>
diff --git a/rules-catalogue/pom.xml b/rules-catalogue/pom.xml
index 0e9a78bd..87c278cd 100644
--- a/rules-catalogue/pom.xml
+++ b/rules-catalogue/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.13</version>
+            <version>2.0.16</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/rules/pom.xml b/rules/pom.xml
index 10d3c836..ec37e329 100644
--- a/rules/pom.xml
+++ b/rules/pom.xml
@@ -135,7 +135,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.13</version>
+            <version>2.0.16</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/rules/rules-reviewed/azure/azure-aws-config.windup.xml b/rules/rules-reviewed/azure/azure-aws-config.windup.xml
index bf89eaf8..78b5e66b 100644
--- a/rules/rules-reviewed/azure/azure-aws-config.windup.xml
+++ b/rules/rules-reviewed/azure/azure-aws-config.windup.xml
@@ -248,4 +248,4 @@
             </perform>
         </rule>        
     </rules>
-</ruleset>
+</ruleset>
\ No newline at end of file
diff --git a/rules/rules-reviewed/azure/tests/azure-aws-config.windup.test.xml b/rules/rules-reviewed/azure/tests/azure-aws-config.windup.test.xml
index 6039597a..d93cd41b 100644
--- a/rules/rules-reviewed/azure/tests/azure-aws-config.windup.test.xml
+++ b/rules/rules-reviewed/azure/tests/azure-aws-config.windup.test.xml
@@ -10,9 +10,7 @@
             <rule id="azure-aws-config-test-01000">
                 <when>
                     <not>
-                        <iterable-filter size="8">
-                            <hint-exists message="The application contains AWS credential configuration"/>
-                        </iterable-filter>
+                        <hint-exists message="The application contains AWS credential configuration"/>
                     </not>
                 </when>
                 <perform>
@@ -22,9 +20,7 @@
             <rule id="azure-aws-config-test-02000">
                 <when>
                     <not>
-                        <iterable-filter size="3">
-                            <hint-exists message="The application contains AWS region configuration"/>
-                        </iterable-filter>
+                        <hint-exists message="The application contains AWS region configuration"/>
                     </not>
                 </when>
                 <perform>
@@ -34,9 +30,7 @@
             <rule id="azure-aws-config-test-03000">
                 <when>
                     <not>
-                        <iterable-filter size="20">
-                            <hint-exists message="The application contains AWS S3 configuration"/>
-                        </iterable-filter>
+                        <hint-exists message="The application contains AWS S3"/>
                     </not>
                 </when>
                 <perform>
@@ -46,9 +40,7 @@
             <rule id="azure-aws-config-test-04000">
                 <when>
                     <not>
-                        <iterable-filter size="6">
-                            <hint-exists message="The application contains Amazon Simple Queue Service configuration"/>
-                        </iterable-filter>
+                        <hint-exists message="The application contains Amazon Simple Queue Service configuration"/>
                     </not>
                 </when>
                 <perform>
@@ -58,9 +50,7 @@
             <rule id="azure-aws-config-test-05000">
                 <when>
                     <not>
-                        <iterable-filter size="2">
-                            <hint-exists message="The application contains AWS Secrets Manager configuration" />
-                        </iterable-filter>
+                        <hint-exists message="The application contains AWS Secrets Manager configuration" />
                     </not>
                 </when>
                 <perform>
diff --git a/rules/rules-reviewed/azure/tests/azure-file-system.windup.test.xml b/rules/rules-reviewed/azure/tests/azure-file-system.windup.test.xml
index be57aa91..44537030 100644
--- a/rules/rules-reviewed/azure/tests/azure-file-system.windup.test.xml
+++ b/rules/rules-reviewed/azure/tests/azure-file-system.windup.test.xml
@@ -10,7 +10,7 @@
             <rule id="azure-file-system-test-02000">
                 <when>
                     <not>
-                        <iterable-filter size="3">
+                        <iterable-filter size="2">
                             <hint-exists message="Relative path found"/>
                         </iterable-filter>
                     </not>