[sling-org-apache-sling-testing-paxexam] branch master updated: SLING-7080 Update options and versions to latest features

[ol...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-paxexam.git


The following commit(s) were added to refs/heads/master by this push:
     new a60e866  SLING-7080 Update options and versions to latest features
a60e866 is described below

commit a60e866349b7d2f1ac8de71d10aaccb633f9d7ac
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Dec 23 23:27:50 2017 +0100

    SLING-7080 Update options and versions to latest features
---
 .../apache/sling/testing/paxexam/SlingOptions.java | 112 ++++++++++-----------
 .../{ => it}/SlingOptionsHttpTestSupport.java      |   2 +-
 .../paxexam/{ => it}/SlingOptionsTestSupport.java  |   2 +-
 .../{ => it}/tests/SlingOptionsComposumIT.java     |   4 +-
 .../{ => it}/tests/SlingOptionsConfigIT.java       |   4 +-
 .../{ => it}/tests/SlingOptionsEventadminIT.java   |   4 +-
 .../paxexam/{ => it}/tests/SlingOptionsHttpIT.java |   4 +-
 .../tests/SlingOptionsHttpWhiteboardIT.java        |   4 +-
 .../{ => it}/tests/SlingOptionsJackrabbitIT.java   |   4 +-
 .../tests/SlingOptionsJackrabbitOakIT.java         |   4 +-
 .../{ => it}/tests/SlingOptionsLogbackIT.java      |   4 +-
 .../{ => it}/tests/SlingOptionsManagementIT.java   |   4 +-
 .../tests/SlingOptionsPaxUrlClasspathIT.java       |   4 +-
 .../{ => it}/tests/SlingOptionsPaxUrlIT.java       |   4 +-
 .../paxexam/{ => it}/tests/SlingOptionsScrIT.java  |   4 +-
 .../tests/SlingOptionsSlingAdapterIT.java}         |  10 +-
 .../tests/SlingOptionsSlingAuthFormIT.java         |   4 +-
 .../tests/SlingOptionsSlingAuthOpenidIT.java       |   4 +-
 .../tests/SlingOptionsSlingAuthSelectorIT.java     |   4 +-
 .../tests/SlingOptionsSlingBundleresourceIT.java}  |  10 +-
 .../SlingOptionsSlingCommonsClassloaderIT.java     |   4 +-
 .../tests/SlingOptionsSlingCommonsCompilerIT.java  |   4 +-
 .../SlingOptionsSlingCommonsFsclassloaderIT.java   |   4 +-
 .../tests/SlingOptionsSlingCommonsHtmlIT.java      |   4 +-
 .../tests/SlingOptionsSlingCommonsMetricsIT.java   |   4 +-
 .../tests/SlingOptionsSlingCommonsSchedulerIT.java |   4 +-
 .../tests/SlingOptionsSlingCommonsThreadsIT.java   |   4 +-
 .../tests/SlingOptionsSlingDiscoveryIT.java}       |  10 +-
 .../tests/SlingOptionsSlingDiscoveryImplIT.java}   |  10 +-
 .../tests/SlingOptionsSlingDiscoveryOakIT.java}    |  10 +-
 .../SlingOptionsSlingDiscoveryStandaloneIT.java}   |  10 +-
 .../tests/SlingOptionsSlingDistributionIT.java}    |  10 +-
 .../tests/SlingOptionsSlingEventIT.java}           |  10 +-
 .../SlingOptionsSlingExtensionsThreaddumpIT.java}  |  10 +-
 .../tests/SlingOptionsSlingFeatureflagsIT.java}    |  10 +-
 .../tests/SlingOptionsSlingFsresourceIT.java}      |  10 +-
 .../tests/SlingOptionsSlingHealthcheckIT.java}     |  10 +-
 .../tests/SlingOptionsSlingI18nIT.java}            |  10 +-
 .../{ => it}/tests/SlingOptionsSlingIT.java        |   4 +-
 .../SlingOptionsSlingInstallerHealthcheckIT.java   |   4 +-
 .../tests/SlingOptionsSlingInstallerIT.java        |   4 +-
 .../SlingOptionsSlingInstallerProviderFileIT.java  |   4 +-
 .../SlingOptionsSlingInstallerProviderJcrIT.java   |   4 +-
 .../tests/SlingOptionsSlingJcrCompilerIT.java      |   4 +-
 .../{ => it}/tests/SlingOptionsSlingJcrIT.java     |   4 +-
 .../SlingOptionsSlingJcrJackrabbitSecurityIT.java  |   4 +-
 .../tests/SlingOptionsSlingJcrRepoinitIT.java      |   4 +-
 .../tests/SlingOptionsSlingJmxProviderIT.java}     |  10 +-
 .../tests/SlingOptionsSlingLaunchpadContentIT.java |   4 +-
 .../tests/SlingOptionsSlingModelsIT.java}          |  10 +-
 .../SlingOptionsSlingModelsJacksonexporterIT.java} |  10 +-
 .../tests/SlingOptionsSlingNosqlCouchbaseIT.java   |   4 +-
 .../tests/SlingOptionsSlingNosqlGenericIT.java     |   4 +-
 .../tests/SlingOptionsSlingNosqlMongodbIT.java     |   4 +-
 .../tests/SlingOptionsSlingPipesIT.java}           |  10 +-
 .../tests/SlingOptionsSlingQueryIT.java}           |  10 +-
 ...lingOptionsSlingQuickstartNosqlCouchbaseIT.java |   4 +-
 .../SlingOptionsSlingQuickstartNosqlMongodbIT.java |   4 +-
 .../tests/SlingOptionsSlingQuickstartOakIT.java    |   4 +-
 .../SlingOptionsSlingQuickstartOakMongoIT.java     |   4 +-
 .../tests/SlingOptionsSlingQuickstartOakTarIT.java |   4 +-
 .../SlingOptionsSlingResourceInventoryIT.java}     |  10 +-
 .../SlingOptionsSlingResourcePresenceIT.java}      |  10 +-
 .../tests/SlingOptionsSlingResourcemergerIT.java}  |  10 +-
 .../tests/SlingOptionsSlingRewriterIT.java}        |  10 +-
 .../tests/SlingOptionsSlingScriptingGroovyIT.java  |   4 +-
 .../tests/SlingOptionsSlingScriptingIT.java        |   4 +-
 .../tests/SlingOptionsSlingScriptingJavaIT.java    |   4 +-
 .../SlingOptionsSlingScriptingJavascriptIT.java    |   4 +-
 .../tests/SlingOptionsSlingScriptingJspIT.java     |   4 +-
 .../tests/SlingOptionsSlingScriptingSightlyIT.java |   4 +-
 .../SlingOptionsSlingScriptingThymeleafIT.java     |   4 +-
 .../tests/SlingOptionsSlingSecurityIT.java}        |  10 +-
 .../tests/SlingOptionsSlingServletsIT.java         |   4 +-
 .../tests/SlingOptionsSlingUrlrewriterIT.java}     |  10 +-
 .../tests/SlingOptionsSlingValidationIT.java}      |  10 +-
 .../tests/SlingOptionsSlingXssIT.java}             |  10 +-
 .../paxexam/{ => it}/tests/SlingOptionsTikaIT.java |   4 +-
 .../{ => it}/tests/SlingOptionsWebconsoleIT.java   |   4 +-
 ...SlingOptionsSlingExtensionBundleresourceIT.java |  48 ---------
 .../SlingOptionsSlingExtensionDiscoveryIT.java     |  48 ---------
 .../SlingOptionsSlingExtensionDiscoveryImplIT.java |  48 ---------
 ...OptionsSlingExtensionDiscoveryStandaloneIT.java |  48 ---------
 .../SlingOptionsSlingExtensionDistributionIT.java  |  48 ---------
 .../SlingOptionsSlingExtensionFeatureflagsIT.java  |  48 ---------
 .../SlingOptionsSlingExtensionJmxProviderIT.java   |  48 ---------
 .../tests/SlingOptionsSlingExtensionModelsIT.java  |  48 ---------
 ...tionsSlingExtensionModelsJacksonexporterIT.java |  48 ---------
 .../tests/SlingOptionsSlingExtensionQueryIT.java   |  48 ---------
 ...ngOptionsSlingExtensionResourceInventoryIT.java |  48 ---------
 ...ingOptionsSlingExtensionResourcePresenceIT.java |  48 ---------
 ...SlingOptionsSlingExtensionResourcemergerIT.java |  48 ---------
 .../SlingOptionsSlingExtensionRewriterIT.java      |  48 ---------
 .../SlingOptionsSlingExtensionSecurityIT.java      |  48 ---------
 .../SlingOptionsSlingExtensionThreaddumpIT.java    |  48 ---------
 .../SlingOptionsSlingExtensionUrlrewriterIT.java   |  48 ---------
 .../SlingOptionsSlingExtensionValidationIT.java    |  48 ---------
 97 files changed, 284 insertions(+), 1156 deletions(-)

diff --git a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
index 1ccafa4..73c52a1 100644
--- a/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
+++ b/src/main/java/org/apache/sling/testing/paxexam/SlingOptions.java
@@ -110,10 +110,10 @@ public class SlingOptions {
         final String filename = String.format("file:%s/src/test/resources/logback.xml", PathUtils.getBaseDir());
         return composite(
             systemProperty("logback.configurationFile").value(filename),
-            mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").version("1.7.21"),
-            mavenBundle().groupId("org.slf4j").artifactId("jcl-over-slf4j").version("1.7.21"),
-            mavenBundle().groupId("ch.qos.logback").artifactId("logback-core").version("1.1.7"),
-            mavenBundle().groupId("ch.qos.logback").artifactId("logback-classic").version("1.1.7"),
+            mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").version(versionResolver),
+            mavenBundle().groupId("org.slf4j").artifactId("jcl-over-slf4j").version(versionResolver),
+            mavenBundle().groupId("ch.qos.logback").artifactId("logback-core").version(versionResolver),
+            mavenBundle().groupId("ch.qos.logback").artifactId("logback-classic").version(versionResolver),
             config()
         );
     }
@@ -234,21 +234,21 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionAdapter() {
+    public static Option slingAdapter() {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.adapter").version(versionResolver)
         );
     }
 
-    public static Option slingExtensionBundleresource() {
+    public static Option slingBundleresource() {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.bundleresource.impl").version(versionResolver)
         );
     }
 
-    public static Option slingExtensionDiscovery() {
+    public static Option slingDiscovery() {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.api").version(versionResolver),
@@ -261,19 +261,19 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionDiscoveryImpl() {
+    public static Option slingDiscoveryImpl() {
         return composite(
             webconsole(),
-            slingExtensionDiscovery(),
+            slingDiscovery(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.impl").version(versionResolver)
         );
     }
 
-    public static Option slingExtensionDiscoveryOak() {
+    public static Option slingDiscoveryOak() {
         return composite(
             webconsole(),
-            slingExtensionDiscovery(),
-            slingExtensionHealthcheck(),
+            slingDiscovery(),
+            slingHealthcheck(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.oak").version(versionResolver),
             factoryConfiguration("org.apache.sling.jcr.repoinit.RepositoryInitializer")
                 .put("scripts", new String[]{"create service user sling-discovery\n\n  create path (sling:Folder) /var/discovery\n\n  create path (sling:Folder) /var/discovery/oak\n\n  set ACL for sling-discovery\n\n    allow   jcr:read    on /var/discovery\n\n    allow   rep:write   on /var/discovery\n\n  end"})
@@ -284,19 +284,19 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionDiscoveryStandalone() {
+    public static Option slingDiscoveryStandalone() {
         return composite(
-            slingExtensionDiscovery(),
+            slingDiscovery(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.discovery.standalone").version(versionResolver)
         );
     }
 
-    public static Option slingExtensionDistribution() {
+    public static Option slingDistribution() {
         return composite(
             sling(),
             slingJcr(),
-            slingExtensionEvent(),
-            slingExtensionHealthcheck(),
+            slingEvent(),
+            slingHealthcheck(),
             jackrabbitVault(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.distribution.api").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.distribution.core").version(versionResolver),
@@ -305,10 +305,10 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionEvent() {
+    public static Option slingEvent() {
         return composite(
             sling(),
-            slingExtensionDiscovery(),
+            slingDiscovery(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.event").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.event.dea").version(versionResolver),
             mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.inventory").version(versionResolver),
@@ -321,22 +321,14 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionExplorer() {
-        return composite(
-            sling(),
-            slingScriptingJavascript(),
-            mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.extensions.explorer").version(versionResolver)
-        );
-    }
-
-    public static Option slingExtensionFeatureflags() {
+    public static Option slingFeatureflags() {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.featureflags").version(versionResolver)
         );
     }
 
-    public static Option slingExtensionFsresource() {
+    public static Option slingFsresource() {
         return composite(
             sling(),
             jackrabbitVault(),
@@ -348,7 +340,7 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionHealthcheck() {
+    public static Option slingHealthcheck() {
         return composite(
             sling(),
             slingJcr(),
@@ -360,7 +352,7 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionI18n() {
+    public static Option slingI18n() {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.i18n").version(versionResolver),
@@ -373,14 +365,14 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionJmxProvider() {
+    public static Option slingJmxProvider() {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.jmx.provider").version(versionResolver)
         );
     }
 
-    public static Option slingExtensionModels() {
+    public static Option slingModels() {
         return composite(
             sling(),
             slingScripting(),
@@ -389,9 +381,9 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionModelsJacksonexporter() {
+    public static Option slingModelsJacksonexporter() {
         return composite(
-            slingExtensionModels(),
+            slingModels(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.models.jacksonexporter").version(versionResolver),
             mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-annotations").version(versionResolver),
             mavenBundle().groupId("com.fasterxml.jackson.core").artifactId("jackson-core").version(versionResolver),
@@ -399,17 +391,17 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionPipes() {
+    public static Option slingPipes() {
         return composite(
             sling(),
             jackrabbit(),
-            slingExtensionEvent(),
-            slingExtensionQuery(),
+            slingEvent(),
+            slingQuery(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.pipes").version(versionResolver)
         );
     }
 
-    public static Option slingExtensionQuery() {
+    public static Option slingQuery() {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.query").version(versionResolver),
@@ -417,7 +409,7 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionResourceInventory() {
+    public static Option slingResourceInventory() {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.resource.inventory").version(versionResolver),
@@ -425,7 +417,7 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionResourcePresence() {
+    public static Option slingResourcePresence() {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.resource.presence").version(versionResolver),
@@ -435,14 +427,14 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionResourcemerger() {
+    public static Option slingResourcemerger() {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.resourcemerger").version(versionResolver)
         );
     }
 
-    public static Option slingExtensionRewriter() {
+    public static Option slingRewriter() {
         return composite(
             sling(),
             slingCommonsHtml(),
@@ -450,20 +442,20 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionSecurity() {
+    public static Option slingSecurity() {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.security").version(versionResolver)
         );
     }
 
-    public static Option slingExtensionThreaddump() {
+    public static Option slingExtensionsThreaddump() {
         return composite(
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.extensions.threaddump").version(versionResolver)
         );
     }
 
-    public static Option slingExtensionUrlrewriter() {
+    public static Option slingUrlrewriter() {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.urlrewriter").version(versionResolver),
@@ -471,10 +463,10 @@ public class SlingOptions {
         );
     }
 
-    public static Option slingExtensionValidation() {
+    public static Option slingValidation() {
         return composite(
             sling(),
-            slingExtensionI18n(),
+            slingI18n(),
             slingServlets(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.validation.api").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.validation.core").version(versionResolver),
@@ -488,7 +480,7 @@ public class SlingOptions {
     }
 
     // DO NOT REMOVE additional system packages
-    public static Option slingExtensionXss() {
+    public static Option slingXss() {
         return composite(
             sling(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.xss").version(versionResolver),
@@ -520,7 +512,7 @@ public class SlingOptions {
     public static Option slingInstallerHealthcheck() {
         return composite(
             slingInstaller(),
-            slingExtensionHealthcheck(),
+            slingHealthcheck(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.installer.hc").version(versionResolver)
         );
     }
@@ -608,7 +600,7 @@ public class SlingOptions {
         return composite(
             sling(),
             slingAuthForm(),
-            slingExtensionExplorer(),
+            composum(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.launchpad.content").version(versionResolver)
         );
     }
@@ -672,9 +664,9 @@ public class SlingOptions {
             slingInstaller(),
             slingJcr(),
             slingJcrRepoinit(),
-            slingExtensionAdapter(),
-            slingExtensionBundleresource(),
-            slingExtensionDiscoveryOak(),
+            slingAdapter(),
+            slingBundleresource(),
+            slingDiscoveryOak(),
             mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.prefs").version(versionResolver),
             mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole.plugins.memoryusage").version(versionResolver),
             mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.webconsole.plugins.packageadmin").version(versionResolver),
@@ -812,9 +804,9 @@ public class SlingOptions {
             slingJcr(),
             slingScripting(),
             slingScriptingJavascript(),
-            slingExtensionI18n(),
-            slingExtensionModels(),
-            slingExtensionXss(),
+            slingI18n(),
+            slingModels(),
+            slingXss(),
             slingCommonsCompiler(),
             slingCommonsFsclassloader(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.sightly").version(versionResolver),
@@ -833,7 +825,7 @@ public class SlingOptions {
         return composite(
             sling(),
             slingScripting(),
-            slingExtensionI18n(),
+            slingI18n(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.scripting.thymeleaf").version(versionResolver),
             mavenBundle().groupId("org.attoparser").artifactId("attoparser").version(versionResolver),
             mavenBundle().groupId("org.unbescape").artifactId("unbescape").version(versionResolver),
@@ -848,7 +840,7 @@ public class SlingOptions {
     public static Option slingServlets() {
         return composite(
             sling(),
-            slingExtensionXss(),
+            slingXss(),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.get").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.post").version(versionResolver),
             mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlets.resolver").version(versionResolver),
@@ -924,7 +916,7 @@ public class SlingOptions {
             sling(),
             slingJcr(),
             slingScriptingJsp(),
-            slingExtensionEvent(),
+            slingEvent(),
             jackrabbitVault(),
             mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-core-commons").version(versionResolver),
             mavenBundle().groupId("com.composum.sling.core").artifactId("composum-sling-core-console").version(versionResolver),
diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsHttpTestSupport.java b/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsHttpTestSupport.java
similarity index 97%
rename from src/test/java/org/apache/sling/testing/paxexam/SlingOptionsHttpTestSupport.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsHttpTestSupport.java
index c581914..5f182b5 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsHttpTestSupport.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsHttpTestSupport.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam;
+package org.apache.sling.testing.paxexam.it;
 
 import java.io.IOException;
 import java.net.ServerSocket;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java b/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java
similarity index 98%
rename from src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java
index 00e73af..7a5d706 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/SlingOptionsTestSupport.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/SlingOptionsTestSupport.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam;
+package org.apache.sling.testing.paxexam.it;
 
 import java.io.File;
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsComposumIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsComposumIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumIT.java
index 7d6f366..aaa6bab 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsComposumIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsComposumIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsConfigIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsConfigIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsConfigIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsConfigIT.java
index 8c93f63..abd3d1d 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsConfigIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsConfigIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsEventadminIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsEventadminIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsEventadminIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsEventadminIT.java
index 95a6b73..602a7df 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsEventadminIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsEventadminIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsHttpIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsHttpIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsHttpIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsHttpIT.java
index ebd45b3..d247211 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsHttpIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsHttpIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsHttpWhiteboardIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsHttpWhiteboardIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsHttpWhiteboardIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsHttpWhiteboardIT.java
index 888011e..b1f063a 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsHttpWhiteboardIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsHttpWhiteboardIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsJackrabbitIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsJackrabbitIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsJackrabbitIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsJackrabbitIT.java
index fea3165..03b146b 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsJackrabbitIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsJackrabbitIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsJackrabbitOakIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsJackrabbitOakIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsJackrabbitOakIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsJackrabbitOakIT.java
index d1a756a..ed6cc4d 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsJackrabbitOakIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsJackrabbitOakIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsLogbackIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsLogbackIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsLogbackIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsLogbackIT.java
index 922f63a..8cfbf28 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsLogbackIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsLogbackIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsManagementIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsManagementIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsManagementIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsManagementIT.java
index db67c95..1777232 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsManagementIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsManagementIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsPaxUrlClasspathIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsPaxUrlClasspathIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsPaxUrlClasspathIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsPaxUrlClasspathIT.java
index 7002a8e..4b21a4c 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsPaxUrlClasspathIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsPaxUrlClasspathIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsPaxUrlIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsPaxUrlIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsPaxUrlIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsPaxUrlIT.java
index d9a4238..7f82333 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsPaxUrlIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsPaxUrlIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsScrIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsScrIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsScrIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsScrIT.java
index 85e839d..c6e7039 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsScrIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsScrIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthFormIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAdapterIT.java
similarity index 85%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthFormIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAdapterIT.java
index b7efb8d..ec0ed8b 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthFormIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAdapterIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingAuthForm;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingAdapter;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingAuthFormIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingAdapterIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingAuthForm()
+            slingAdapter()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthFormIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthFormIT.java
similarity index 92%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthFormIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthFormIT.java
index b7efb8d..2551176 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthFormIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthFormIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthOpenidIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthOpenidIT.java
similarity index 92%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthOpenidIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthOpenidIT.java
index f5f9d1a..d18f3e1 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthOpenidIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthOpenidIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthSelectorIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthSelectorIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthSelectorIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthSelectorIT.java
index 31c575f..d492c34 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthSelectorIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingAuthSelectorIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionEventIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingBundleresourceIT.java
similarity index 85%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionEventIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingBundleresourceIT.java
index 9b99d60..bb2199f 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionEventIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingBundleresourceIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionEvent;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingBundleresource;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionEventIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingBundleresourceIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingExtensionEvent()
+            slingBundleresource()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsClassloaderIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsClassloaderIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsClassloaderIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsClassloaderIT.java
index 3ff78d2..43c51d0 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsClassloaderIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsClassloaderIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsCompilerIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsCompilerIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsCompilerIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsCompilerIT.java
index f90dc1b..093fa77 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsCompilerIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsCompilerIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsFsclassloaderIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsFsclassloaderIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsFsclassloaderIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsFsclassloaderIT.java
index 7537b2f..9df273f 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsFsclassloaderIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsFsclassloaderIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsHtmlIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsHtmlIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsHtmlIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsHtmlIT.java
index cc3f4d8..cd5b967 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsHtmlIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsHtmlIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsMetricsIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsMetricsIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsMetricsIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsMetricsIT.java
index 63d4f1b..85aca20 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsMetricsIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsMetricsIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsSchedulerIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsSchedulerIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsSchedulerIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsSchedulerIT.java
index 4b0f3ba..bf181b8 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsSchedulerIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsSchedulerIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsThreadsIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsThreadsIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsThreadsIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsThreadsIT.java
index 5331f94..59c024c 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingCommonsThreadsIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingCommonsThreadsIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryIT.java
similarity index 86%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryIT.java
index d6f4e10..8dbc986 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingInstaller;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingDiscovery;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingInstallerIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingDiscoveryIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingInstaller()
+            slingDiscovery()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionI18nIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryImplIT.java
similarity index 85%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionI18nIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryImplIT.java
index c303370..c016a80 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionI18nIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryImplIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionI18n;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingDiscoveryImpl;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionI18nIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingDiscoveryImplIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingExtensionI18n()
+            slingDiscoveryImpl()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionXssIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryOakIT.java
similarity index 86%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionXssIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryOakIT.java
index ad1ae88..728407f 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionXssIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryOakIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionXss;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingDiscoveryOak;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionXssIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingDiscoveryOakIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingExtensionXss()
+            slingDiscoveryOak()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionFsresourceIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryStandaloneIT.java
similarity index 85%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionFsresourceIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryStandaloneIT.java
index 0f20995..7ebd488 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionFsresourceIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDiscoveryStandaloneIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionFsresource;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingDiscoveryStandalone;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionFsresourceIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingDiscoveryStandaloneIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingExtensionFsresource()
+            slingDiscoveryStandalone()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionXssIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDistributionIT.java
similarity index 86%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionXssIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDistributionIT.java
index ad1ae88..9a34420 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionXssIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingDistributionIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionXss;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingDistribution;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionXssIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingDistributionIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingExtensionXss()
+            slingDistribution()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingEventIT.java
similarity index 86%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingEventIT.java
index 03ec3ae..6fb07e8 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingEventIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingJcr;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingEvent;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingJcrIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingEventIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingJcr()
+            slingEvent()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionHealthcheckIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingExtensionsThreaddumpIT.java
similarity index 85%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionHealthcheckIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingExtensionsThreaddumpIT.java
index 26ad5f4..1ba9569 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionHealthcheckIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingExtensionsThreaddumpIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionHealthcheck;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionsThreaddump;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionHealthcheckIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingExtensionsThreaddumpIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingExtensionHealthcheck()
+            slingExtensionsThreaddump()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionXssIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingFeatureflagsIT.java
similarity index 86%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionXssIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingFeatureflagsIT.java
index ad1ae88..3972008 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionXssIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingFeatureflagsIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionXss;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingFeatureflags;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionXssIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingFeatureflagsIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingExtensionXss()
+            slingFeatureflags()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthOpenidIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingFsresourceIT.java
similarity index 86%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthOpenidIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingFsresourceIT.java
index f5f9d1a..6ba8529 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthOpenidIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingFsresourceIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingAuthOpenid;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingFsresource;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingAuthOpenidIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingFsresourceIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingAuthOpenid()
+            slingFsresource()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrCompilerIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingHealthcheckIT.java
similarity index 86%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrCompilerIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingHealthcheckIT.java
index 36d686f..854fd13 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrCompilerIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingHealthcheckIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingJcrCompiler;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingHealthcheck;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingJcrCompilerIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingHealthcheckIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingJcrCompiler()
+            slingHealthcheck()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingI18nIT.java
similarity index 86%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingI18nIT.java
index 03ec3ae..069f6a3 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingI18nIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingJcr;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingI18n;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingJcrIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingI18nIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingJcr()
+            slingI18n()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingIT.java
index d2021f1..47521b4 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerHealthcheckIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingInstallerHealthcheckIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerHealthcheckIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingInstallerHealthcheckIT.java
index ba16e8c..4cf1f93 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerHealthcheckIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingInstallerHealthcheckIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingInstallerIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingInstallerIT.java
index d6f4e10..f0e170a 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingInstallerIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerProviderFileIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingInstallerProviderFileIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerProviderFileIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingInstallerProviderFileIT.java
index a2fbb0b..89f24d4 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerProviderFileIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingInstallerProviderFileIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerProviderJcrIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingInstallerProviderJcrIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerProviderJcrIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingInstallerProviderJcrIT.java
index c461458..96f0b92 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingInstallerProviderJcrIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingInstallerProviderJcrIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrCompilerIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJcrCompilerIT.java
similarity index 92%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrCompilerIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJcrCompilerIT.java
index 36d686f..0821615 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrCompilerIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJcrCompilerIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJcrIT.java
similarity index 92%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJcrIT.java
index 03ec3ae..64d27c1 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJcrIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrJackrabbitSecurityIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJcrJackrabbitSecurityIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrJackrabbitSecurityIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJcrJackrabbitSecurityIT.java
index 315fc5f..8e75f38 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrJackrabbitSecurityIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJcrJackrabbitSecurityIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrRepoinitIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJcrRepoinitIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrRepoinitIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJcrRepoinitIT.java
index d3bbe4c..35204ef 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrRepoinitIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJcrRepoinitIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrCompilerIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJmxProviderIT.java
similarity index 86%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrCompilerIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJmxProviderIT.java
index 36d686f..6ff9e1f 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrCompilerIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingJmxProviderIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingJcrCompiler;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingJmxProvider;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingJcrCompilerIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingJmxProviderIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingJcrCompiler()
+            slingJmxProvider()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingLaunchpadContentIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingLaunchpadContentIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingLaunchpadContentIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingLaunchpadContentIT.java
index b6ca81e..f4efadc 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingLaunchpadContentIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingLaunchpadContentIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthFormIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingModelsIT.java
similarity index 86%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthFormIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingModelsIT.java
index b7efb8d..d9c01c6 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthFormIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingModelsIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingAuthForm;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingModels;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingAuthFormIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingModelsIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingAuthForm()
+            slingModels()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDiscoveryOakIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingModelsJacksonexporterIT.java
similarity index 85%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDiscoveryOakIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingModelsJacksonexporterIT.java
index f9638fd..35c59f0 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDiscoveryOakIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingModelsJacksonexporterIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionDiscoveryOak;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingModelsJacksonexporter;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionDiscoveryOakIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingModelsJacksonexporterIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingExtensionDiscoveryOak()
+            slingModelsJacksonexporter()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingNosqlCouchbaseIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlCouchbaseIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingNosqlCouchbaseIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlCouchbaseIT.java
index 8a4d644..ee3af08 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingNosqlCouchbaseIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlCouchbaseIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingNosqlGenericIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlGenericIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingNosqlGenericIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlGenericIT.java
index f0a06e1..f441244 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingNosqlGenericIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlGenericIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingNosqlMongodbIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlMongodbIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingNosqlMongodbIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlMongodbIT.java
index f980f5b..5fc94cf 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingNosqlMongodbIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingNosqlMongodbIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingPipesIT.java
similarity index 86%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingPipesIT.java
index 03ec3ae..1232fd1 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingPipesIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingJcr;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingPipes;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingJcrIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingPipesIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingJcr()
+            slingPipes()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQueryIT.java
similarity index 86%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQueryIT.java
index 03ec3ae..7d556c3 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQueryIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingJcr;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingQuery;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingJcrIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingQueryIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingJcr()
+            slingQuery()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartNosqlCouchbaseIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlCouchbaseIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartNosqlCouchbaseIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlCouchbaseIT.java
index 371797c..80bf576 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartNosqlCouchbaseIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlCouchbaseIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartNosqlMongodbIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlMongodbIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartNosqlMongodbIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlMongodbIT.java
index 5083c62..f44e981 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartNosqlMongodbIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartNosqlMongodbIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartOakIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartOakIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartOakIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartOakIT.java
index 5169b20..9547bf7 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartOakIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartOakIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartOakMongoIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartOakMongoIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartOakMongoIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartOakMongoIT.java
index ed075cc..2668d51 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartOakMongoIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartOakMongoIT.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
 import java.io.IOException;
 
-import org.apache.sling.testing.paxexam.SlingOptionsHttpTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsHttpTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartOakTarIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartOakTarIT.java
similarity index 93%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartOakTarIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartOakTarIT.java
index 868a34b..1c03ec5 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingQuickstartOakTarIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingQuickstartOakTarIT.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
 import java.io.IOException;
 
-import org.apache.sling.testing.paxexam.SlingOptionsHttpTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsHttpTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionExplorerIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingResourceInventoryIT.java
similarity index 85%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionExplorerIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingResourceInventoryIT.java
index 512b459..82e5d21 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionExplorerIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingResourceInventoryIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionExplorer;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingResourceInventory;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionExplorerIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingResourceInventoryIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingExtensionExplorer()
+            slingResourceInventory()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionAdapterIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingResourcePresenceIT.java
similarity index 85%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionAdapterIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingResourcePresenceIT.java
index abb0c2c..0f3df9d 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionAdapterIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingResourcePresenceIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionAdapter;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingResourcePresence;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionAdapterIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingResourcePresenceIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingExtensionAdapter()
+            slingResourcePresence()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionPipesIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingResourcemergerIT.java
similarity index 85%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionPipesIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingResourcemergerIT.java
index 76570d8..8e3b21d 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionPipesIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingResourcemergerIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionPipes;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingResourcemerger;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionPipesIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingResourcemergerIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingExtensionPipes()
+            slingResourcemerger()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingServletsIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingRewriterIT.java
similarity index 86%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingServletsIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingRewriterIT.java
index 28fb141..9d91e3d 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingServletsIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingRewriterIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingServlets;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingRewriter;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingServletsIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingRewriterIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingServlets()
+            slingRewriter()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingGroovyIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingGroovyIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingGroovyIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingGroovyIT.java
index 2c6b3fe..bc20dc3 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingGroovyIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingGroovyIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingIT.java
index b1b53bd..63072c8 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingJavaIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingJavaIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingJavaIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingJavaIT.java
index cc15e8f..cc2da61 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingJavaIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingJavaIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingJavascriptIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingJavascriptIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingJavascriptIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingJavascriptIT.java
index d72fe8f..e76ce39 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingJavascriptIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingJavascriptIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingJspIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingJspIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingJspIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingJspIT.java
index dd9c2b5..4438213 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingJspIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingJspIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingSightlyIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingSightlyIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingSightlyIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingSightlyIT.java
index d3a4f98..17e261e 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingSightlyIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingSightlyIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingThymeleafIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingThymeleafIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingThymeleafIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingThymeleafIT.java
index 7bf0036..26de4fd 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingScriptingThymeleafIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingScriptingThymeleafIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingServletsIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingSecurityIT.java
similarity index 86%
copy from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingServletsIT.java
copy to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingSecurityIT.java
index 28fb141..8c088fa 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingServletsIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingSecurityIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingServlets;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingSecurity;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingServletsIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingSecurityIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingServlets()
+            slingSecurity()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingServletsIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingServletsIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingServletsIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingServletsIT.java
index 28fb141..f805d17 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingServletsIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingServletsIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrCompilerIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingUrlrewriterIT.java
similarity index 86%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrCompilerIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingUrlrewriterIT.java
index 36d686f..da5c15f 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrCompilerIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingUrlrewriterIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingJcrCompiler;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingUrlrewriter;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingJcrCompilerIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingUrlrewriterIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingJcrCompiler()
+            slingUrlrewriter()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthOpenidIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingValidationIT.java
similarity index 86%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthOpenidIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingValidationIT.java
index f5f9d1a..9a413b3 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingAuthOpenidIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingValidationIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingAuthOpenid;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingValidation;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingAuthOpenidIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingValidationIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingAuthOpenid()
+            slingValidation()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingXssIT.java
similarity index 86%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingXssIT.java
index 03ec3ae..f6c9fa5 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingJcrIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsSlingXssIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -27,17 +27,17 @@ import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
 import org.ops4j.pax.exam.spi.reactors.PerClass;
 
-import static org.apache.sling.testing.paxexam.SlingOptions.slingJcr;
+import static org.apache.sling.testing.paxexam.SlingOptions.slingXss;
 
 @RunWith(PaxExam.class)
 @ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingJcrIT extends SlingOptionsTestSupport {
+public class SlingOptionsSlingXssIT extends SlingOptionsTestSupport {
 
     @Configuration
     public Option[] configuration() {
         return new Option[]{
             baseConfiguration(),
-            slingJcr()
+            slingXss()
         };
     }
 
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsTikaIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsTikaIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsTikaIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsTikaIT.java
index 028c5a4..a2f0146 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsTikaIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsTikaIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsWebconsoleIT.java b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsWebconsoleIT.java
similarity index 92%
rename from src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsWebconsoleIT.java
rename to src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsWebconsoleIT.java
index fcd83e4..e24b578 100644
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsWebconsoleIT.java
+++ b/src/test/java/org/apache/sling/testing/paxexam/it/tests/SlingOptionsWebconsoleIT.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.testing.paxexam.tests;
+package org.apache.sling.testing.paxexam.it.tests;
 
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
+import org.apache.sling.testing.paxexam.it.SlingOptionsTestSupport;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionBundleresourceIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionBundleresourceIT.java
deleted file mode 100644
index e83e355..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionBundleresourceIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionBundleresource;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionBundleresourceIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionBundleresource()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDiscoveryIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDiscoveryIT.java
deleted file mode 100644
index cb58c31..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDiscoveryIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionDiscovery;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionDiscoveryIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionDiscovery()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDiscoveryImplIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDiscoveryImplIT.java
deleted file mode 100644
index 5ae8aac..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDiscoveryImplIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionDiscoveryImpl;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionDiscoveryImplIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionDiscoveryImpl()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDiscoveryStandaloneIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDiscoveryStandaloneIT.java
deleted file mode 100644
index 1f80775..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDiscoveryStandaloneIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionDiscoveryStandalone;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionDiscoveryStandaloneIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionDiscoveryStandalone()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDistributionIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDistributionIT.java
deleted file mode 100644
index 7533cbd..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionDistributionIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionDistribution;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionDistributionIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionDistribution()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionFeatureflagsIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionFeatureflagsIT.java
deleted file mode 100644
index ee9d312..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionFeatureflagsIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionFeatureflags;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionFeatureflagsIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionFeatureflags()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionJmxProviderIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionJmxProviderIT.java
deleted file mode 100644
index b871989..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionJmxProviderIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionJmxProvider;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionJmxProviderIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionJmxProvider()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionModelsIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionModelsIT.java
deleted file mode 100644
index bbe91ad..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionModelsIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionModels;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionModelsIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionModels()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionModelsJacksonexporterIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionModelsJacksonexporterIT.java
deleted file mode 100644
index 1b5e904..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionModelsJacksonexporterIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionModelsJacksonexporter;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionModelsJacksonexporterIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionModelsJacksonexporter()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionQueryIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionQueryIT.java
deleted file mode 100644
index a466beb..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionQueryIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionQuery;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionQueryIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionQuery()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionResourceInventoryIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionResourceInventoryIT.java
deleted file mode 100644
index 648d3d9..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionResourceInventoryIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionResourceInventory;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionResourceInventoryIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionResourceInventory()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionResourcePresenceIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionResourcePresenceIT.java
deleted file mode 100644
index a761975..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionResourcePresenceIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionResourcePresence;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionResourcePresenceIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionResourcePresence()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionResourcemergerIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionResourcemergerIT.java
deleted file mode 100644
index c6b72a0..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionResourcemergerIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionResourcemerger;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionResourcemergerIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionResourcemerger()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionRewriterIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionRewriterIT.java
deleted file mode 100644
index 5c1fb98..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionRewriterIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionRewriter;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionRewriterIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionRewriter()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionSecurityIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionSecurityIT.java
deleted file mode 100644
index 0d0f04d..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionSecurityIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionSecurity;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionSecurityIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionSecurity()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionThreaddumpIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionThreaddumpIT.java
deleted file mode 100644
index b4a0c39..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionThreaddumpIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionThreaddump;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionThreaddumpIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionThreaddump()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionUrlrewriterIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionUrlrewriterIT.java
deleted file mode 100644
index fad98fd..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionUrlrewriterIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionUrlrewriter;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionUrlrewriterIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionUrlrewriter()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}
diff --git a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionValidationIT.java b/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionValidationIT.java
deleted file mode 100644
index 27a1316..0000000
--- a/src/test/java/org/apache/sling/testing/paxexam/tests/SlingOptionsSlingExtensionValidationIT.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.
- */
-package org.apache.sling.testing.paxexam.tests;
-
-import org.apache.sling.testing.paxexam.SlingOptionsTestSupport;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerClass;
-
-import static org.apache.sling.testing.paxexam.SlingOptions.slingExtensionValidation;
-
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerClass.class)
-public class SlingOptionsSlingExtensionValidationIT extends SlingOptionsTestSupport {
-
-    @Configuration
-    public Option[] configuration() {
-        return new Option[]{
-            baseConfiguration(),
-            slingExtensionValidation()
-        };
-    }
-
-    @Test
-    public void test() {
-    }
-
-}

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].