1513 files changed, 1207 insertions, 3964 deletions

diff --git a/format-headers.sh b/format-headers.sh
index d66fb671715..e354ddf14ad 100755
--- a/format-headers.sh
+++ b/format-headers.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 # Set correct copyright headers
 
-mvn license:format -Pit
+mvn license:format -Ptests
diff --git a/it/it-projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo.highlighting b/it/it-projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo.highlighting
deleted file mode 100644
index b4404112cf0..00000000000
--- a/it/it-projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo.highlighting
+++ /dev/null
@@ -1,15 +0,0 @@
-#package
-0:7:k
-#public
-19:25:k
-#class
-26:31:k
-#public
-46:52:k
-#private
-94:101:k
-#return
-#Here class is wrong and will be fixed during next analysis
-125:131:s
-#"hello"
-132:139:s
\ No newline at end of file
diff --git a/it/it-projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.symbol b/it/it-projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.symbol
deleted file mode 100644
index a670a2d7b2d..00000000000
--- a/it/it-projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.symbol
+++ /dev/null
@@ -1,4 +0,0 @@
-#j
-60:61
-#i
-64:65,80:81
diff --git a/it/it-tests/pom.xml b/it/it-tests/pom.xml
deleted file mode 100644
index 0e1ee808e14..00000000000
--- a/it/it-tests/pom.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it</artifactId>
-    <version>6.5-SNAPSHOT</version>
-  </parent>
-  <artifactId>it-tests</artifactId>
-  <name>SonarQube Integration Tests :: Tests</name>
-
-  <properties>
-    <category>*</category>
-    <skipIts>false</skipIts>
-    <jetty.version>9.3.11.v20160721</jetty.version>
-  </properties>
-
-  <dependencies>
-    <!-- must be declared first -->
-    <dependency>
-      <groupId>org.sonarsource.orchestrator</groupId>
-      <artifactId>sonar-orchestrator</artifactId>
-      <version>${orchestrator.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-application</artifactId>
-      <version>${project.version}</version>
-      <type>zip</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.sonarsource.sonarqube</groupId>
-      <artifactId>sonar-ws</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.sonarsource.sonarqube</groupId>
-      <artifactId>it-plugins</artifactId>
-      <version>${project.version}</version>
-      <type>pom</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.codeborne</groupId>
-      <artifactId>selenide</artifactId>
-      <version>4.4.3</version>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <!-- required for selenide -->
-      <version>21.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-ws-client</artifactId>
-      <version>5.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-update-center-common</artifactId>
-      <version>1.12.1</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.googlecode.json-simple</groupId>
-      <artifactId>json-simple</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.skyscreamer</groupId>
-      <artifactId>jsonassert</artifactId>
-      <version>1.2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jsoup</groupId>
-      <artifactId>jsoup</artifactId>
-      <version>1.8.3</version>
-    </dependency>
-    <dependency>
-      <groupId>com.squareup.okhttp3</groupId>
-      <artifactId>mockwebserver</artifactId>
-    </dependency>
-
-    <!-- Email notifications -->
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-email</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.subethamail</groupId>
-      <artifactId>subethasmtp</artifactId>
-    </dependency>
-    
-    <!-- SSL tests -->
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-proxy</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.sonarsource.scanner.cli</groupId>
-      <artifactId>sonar-scanner-cli</artifactId>
-      <version>2.7</version>
-      <type>zip</type>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>-Xmx128m -Dsonar.runtimeVersion=${project.version}
-            -Dmaven.localRepository=${settings.localRepository}
-          </argLine>
-          <skipTests>${skipIts}</skipTests>
-          <includes>
-            <include>*/${category}Suite.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>qa</id>
-      <activation>
-        <property>
-          <name>env.SONARSOURCE_QA</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy-sonarqube-zip</id>
-                <phase>generate-test-resources</phase>
-                <goals>
-                  <goal>copy</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>sonar-application</artifactId>
-                      <version>${project.version}</version>
-                      <type>zip</type>
-                      <overWrite>true</overWrite>
-                    </artifactItem>
-                  </artifactItems>
-                  <outputDirectory>${project.basedir}/../../sonar-application/target</outputDirectory>
-                  <overWriteReleases>true</overWriteReleases>
-                  <overWriteSnapshots>true</overWriteSnapshots>
-                </configuration>
-              </execution>
-              <execution>
-                <id>copy-xoo-plugin</id>
-                <phase>generate-test-resources</phase>
-                <goals>
-                  <goal>copy</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>sonar-xoo-plugin</artifactId>
-                      <version>${project.version}</version>
-                      <type>sonar-plugin</type>
-                      <overWrite>true</overWrite>
-                    </artifactItem>
-                  </artifactItems>
-                  <outputDirectory>${project.basedir}/../../plugins/sonar-xoo-plugin/target</outputDirectory>
-                  <overWriteReleases>true</overWriteReleases>
-                  <overWriteSnapshots>true</overWriteSnapshots>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>with-db-drivers</id>
-      <activation>
-        <property>
-          <name>with-db-drivers</name>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>mysql</groupId>
-          <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.postgresql</groupId>
-          <artifactId>postgresql</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>com.oracle</groupId>
-          <artifactId>ojdbc6</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>com.microsoft.sqlserver</groupId>
-          <artifactId>mssql-jdbc</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
-
-</project>
diff --git a/it/it-tests/src/test/resources/ItUtils.txt b/it/it-tests/src/test/resources/ItUtils.txt
deleted file mode 100644
index e95e310afe6..00000000000
--- a/it/it-tests/src/test/resources/ItUtils.txt
+++ /dev/null
@@ -1 +0,0 @@
-Used by ItUtils to locate root directory of sources
diff --git a/it/it-tests/src/test/resources/issue/one-issue-per-line-profile.xml b/it/it-tests/src/test/resources/issue/one-issue-per-line-profile.xml
deleted file mode 100644
index 28cebcc2380..00000000000
--- a/it/it-tests/src/test/resources/issue/one-issue-per-line-profile.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?><!-- Generated by Sonar -->
-<profile>
-  <name>one-issue-per-line-profile</name>
-  <language>xoo</language>
-  <rules>
-    <rule>
-      <repositoryKey>xoo</repositoryKey>
-      <key>OneIssuePerLine</key>
-      <priority>CRITICAL</priority>
-    </rule>
-  </rules>
-</profile>
diff --git a/it/pom.xml b/it/pom.xml
deleted file mode 100644
index 3c57da3d396..00000000000
--- a/it/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>sonarqube</artifactId>
-    <version>6.5-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>it</artifactId>
-  <name>SonarQube Integration Tests</name>
-  <packaging>pom</packaging>
-
-  <properties>
-    <maven.deploy.skip>true</maven.deploy.skip>
-    <source.skip>true</source.skip>
-    <enforcer.skip>true</enforcer.skip>
-  </properties>
-
-  <modules>
-    <module>it-plugins</module>
-    <module>it-tests</module>
-  </modules>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 6035c0fabfb..14228506e9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1380,11 +1380,11 @@
     </profile>
 
     <profile>
-      <!-- integration, performance and upgrade tests -->
+      <!-- integration tests -->
       <id>tests</id>
       <modules>
-        <module>it</module>
         <module>tests</module>
+        <module>tests/plugins</module>
       </modules>
     </profile>
   </profiles>
diff --git a/run-integration-tests.sh b/run-integration-tests.sh
index 82f20df03b4..be0501aa8e1 100755
--- a/run-integration-tests.sh
+++ b/run-integration-tests.sh
@@ -16,9 +16,12 @@ CATEGORY=$1
 ORCHESTRATOR_CONFIG_URL=$2
 shift 2
 
-cd it
+cd tests/plugins
+mvn clean package
+
+cd ..
 mvn verify \
   -Dcategory=$CATEGORY \
   -Dorchestrator.configUrl=$ORCHESTRATOR_CONFIG_URL \
   -Dwith-db-drivers \
-  -Dsource.skip=true -B -e -V $*
+  -B -e -V $*
diff --git a/run-perf-tests.sh b/run-perf-tests.sh
index d16d80c981b..b194e57b7a4 100755
--- a/run-perf-tests.sh
+++ b/run-perf-tests.sh
@@ -2,5 +2,5 @@
 set -euo pipefail
 
 echo 'Run performance tests'
-cd tests/perf
-mvn verify -B -e -V $*
+cd tests
+mvn verify -B -e -V -Dcategory=Performance $*
diff --git a/run-upgrade-tests.sh b/run-upgrade-tests.sh
index 90c61bd914b..696d4eedf66 100755
--- a/run-upgrade-tests.sh
+++ b/run-upgrade-tests.sh
@@ -13,8 +13,8 @@ set -euo pipefail
 ORCHESTRATOR_CONFIG_URL=$1
 shift 1
 
-cd tests/upgrade
+cd tests
 mvn verify \
   -Pwith-db-drivers \
   -Dorchestrator.configUrl=$ORCHESTRATOR_CONFIG_URL \
-  -B -e -V $*
+  -Dcategory=Upgrade -B -e -V $*
diff --git a/scripts/setupRamdisk.sh b/scripts/setupRamdisk.sh
deleted file mode 100755
index 1ac8f5b158d..00000000000
--- a/scripts/setupRamdisk.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-RED='\033[0;31m'
-NC='\033[0m' # No Color
-printf "${RED}SETUP RAMDISK${NC}\n"
-printf "${RED}disk size before build${NC}\n"
-df -h
-du -sh $HOME
-
-printf "${RED}move original home${NC}\n"
-sudo mv /home/travis /home/travis.ori
-printf "${RED}create ramdisk mount point${NC}\n"
-sudo mkdir -p /home/travis
-printf "${RED}create ramdisk${NC}\n"
-sudo mount -t tmpfs -o size=8192m tmps /home/travis
-printf "${RED}copy home to ramdisk${NC}\n"
-time sudo cp -R /home/travis.ori/. /home/travis
-printf "${RED}give permissions to travis on its home in ramdisk${NC}\n"
-sudo chown -R travis:travis /home/travis
-
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureQueryTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureQueryTest.java
index 5fe083e92f6..3e083c415bb 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureQueryTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureQueryTest.java
@@ -19,13 +19,12 @@
  */
 package org.sonar.db.measure;
 
-import java.util.Collections;
-import org.assertj.core.api.Java6Assertions;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class MeasureQueryTest {
@@ -34,7 +33,7 @@ public class MeasureQueryTest {
   public ExpectedException expectedException = ExpectedException.none();
 
   @Test
-  public void create_query_from_projects() throws Exception {
+  public void create_query_from_projects() {
     MeasureQuery query = MeasureQuery.builder().setProjectUuids(asList("PROJECT_1", "PROJECT_2")).build();
 
     assertThat(query.getProjectUuids()).containsOnly("PROJECT_1", "PROJECT_2");
@@ -44,7 +43,7 @@ public class MeasureQueryTest {
   }
 
   @Test
-  public void create_query_from_project_and_components() throws Exception {
+  public void create_query_from_project_and_components() {
     MeasureQuery query = MeasureQuery.builder().setComponentUuids("PROJECT_1", asList("FILE_1", "FILE_2")).build();
 
     assertThat(query.getProjectUuids()).containsOnly("PROJECT_1");
@@ -56,7 +55,7 @@ public class MeasureQueryTest {
   }
 
   @Test
-  public void create_query_from_single_component_uuid() throws Exception {
+  public void create_query_from_single_component_uuid() {
     MeasureQuery query = MeasureQuery.builder().setComponentUuid("FILE_1").build();
 
     assertThat(query.getComponentUuids()).containsOnly("FILE_1");
@@ -67,7 +66,7 @@ public class MeasureQueryTest {
   }
 
   @Test
-  public void create_query_from_metric_ids() throws Exception {
+  public void create_query_from_metric_ids() {
     MeasureQuery query = MeasureQuery.builder().setProjectUuids(asList("PROJECT_1", "PROJECT_2")).setMetricIds(asList(10, 11)).build();
 
     assertThat(query.getMetricIds()).containsOnly(10, 11);
@@ -75,7 +74,7 @@ public class MeasureQueryTest {
   }
 
   @Test
-  public void create_query_from_metric_keys() throws Exception {
+  public void create_query_from_metric_keys() {
     MeasureQuery query = MeasureQuery.builder().setProjectUuids(asList("PROJECT_1", "PROJECT_2")).setMetricKeys(asList("M1", "M2")).build();
 
     assertThat(query.getMetricKeys()).containsOnly("M1", "M2");
@@ -83,54 +82,54 @@ public class MeasureQueryTest {
   }
 
   @Test
-  public void create_query_from_person_id() throws Exception {
+  public void create_query_from_person_id() {
     MeasureQuery query = MeasureQuery.builder().setProjectUuids(asList("PROJECT_1", "PROJECT_2")).setPersonId(100L).build();
 
     assertThat(query.getPersonId()).isEqualTo(100L);
   }
 
   @Test
-  public void return_empty_when_metrics_are_empty() throws Exception {
-    Java6Assertions.assertThat(MeasureQuery.builder()
+  public void return_empty_when_metrics_are_empty() {
+    assertThat(MeasureQuery.builder()
       .setProjectUuids(asList("PROJECT_1", "PROJECT_2"))
-      .setMetricKeys(Collections.emptyList())
+      .setMetricKeys(emptyList())
       .build().returnsEmpty()).isTrue();
 
-    Java6Assertions.assertThat(MeasureQuery.builder()
+    assertThat(MeasureQuery.builder()
       .setProjectUuids(asList("PROJECT_1", "PROJECT_2"))
-      .setMetricIds(Collections.emptyList())
+      .setMetricIds(emptyList())
       .build().returnsEmpty()).isTrue();
   }
 
   @Test
-  public void return_empty_when_projects_are_empty() throws Exception {
-    Java6Assertions.assertThat(MeasureQuery.builder()
-      .setProjectUuids(Collections.emptyList())
+  public void return_empty_when_projects_are_empty() {
+    assertThat(MeasureQuery.builder()
+      .setProjectUuids(emptyList())
       .build().returnsEmpty()).isTrue();
   }
 
   @Test
-  public void return_empty_when_components_are_empty() throws Exception {
-    Java6Assertions.assertThat(MeasureQuery.builder()
-      .setComponentUuids("PROJECT", Collections.emptyList())
+  public void return_empty_when_components_are_empty() {
+    assertThat(MeasureQuery.builder()
+      .setComponentUuids("PROJECT", emptyList())
       .build().returnsEmpty()).isTrue();
   }
 
   @Test
-  public void fail_when_no_component_uuid_filter() throws Exception {
+  public void fail_when_no_component_uuid_filter() {
     expectedException.expect(IllegalArgumentException.class);
     expectedException.expectMessage("At least one filter on component UUID is expected");
     MeasureQuery.builder().build();
   }
 
   @Test
-  public void fail_when_component_uuids_without_project_uuid() throws Exception {
+  public void fail_when_component_uuids_without_project_uuid() {
     expectedException.expect(NullPointerException.class);
     MeasureQuery.builder().setComponentUuids(null, asList("FILE_1", "FILE_2")).build();
   }
 
   @Test
-  public void fail_when_using_metric_ids_and_metric_keys() throws Exception {
+  public void fail_when_using_metric_ids_and_metric_keys() {
     expectedException.expect(IllegalArgumentException.class);
     expectedException.expectMessage("Metric IDs and keys must not be set both");
     MeasureQuery.builder().setMetricIds(asList(10, 11)).setMetricKeys(asList("M1", "M2")).setProjectUuids(asList("PROJECT_1", "PROJECT_2")).build();
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/PermissionQueryTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/PermissionQueryTest.java
index 1645cc80a57..7097df8680d 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/PermissionQueryTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/PermissionQueryTest.java
@@ -23,7 +23,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class PermissionQueryTest {
 
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/JavaProcessLauncherImplTest.java b/server/sonar-process-monitor/src/test/java/org/sonar/application/process/JavaProcessLauncherImplTest.java
index 988d1b56e19..2d00d230b26 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/JavaProcessLauncherImplTest.java
+++ b/server/sonar-process-monitor/src/test/java/org/sonar/application/process/JavaProcessLauncherImplTest.java
@@ -33,7 +33,7 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.process.AllProcessesCommands;
 import org.sonar.process.ProcessId;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.MapEntry.entry;
 import static org.mockito.Mockito.RETURNS_MOCKS;
 import static org.mockito.Mockito.mock;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java
index b5a83947d1b..079ff5ec5d6 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java
@@ -35,7 +35,7 @@ import org.sonar.server.authentication.event.AuthenticationEvent;
 import org.sonar.server.usertoken.UserTokenAuthenticator;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.rules.ExpectedException.none;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java
index 574832e5805..ddd673119d4 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java
@@ -50,7 +50,7 @@ import org.sonar.server.user.index.UserIndexer;
 import org.sonar.server.usergroups.DefaultGroupFinder;
 
 import static java.util.Arrays.stream;
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.rules.ExpectedException.none;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyMap;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java
index 1ba6b0abe11..238125c3188 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 import static com.google.common.base.Strings.repeat;
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.api.resources.Qualifiers.PROJECT;
 import static org.sonar.server.component.NewComponent.newComponentBuilder;
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java
index 68af5bc8837..451edc64090 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java
@@ -52,7 +52,7 @@ import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepos
 import static com.google.common.base.Joiner.on;
 import static java.util.Arrays.stream;
 import static java.util.stream.Collectors.toList;
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java
index 6575221895d..05124b164a5 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java
@@ -32,7 +32,7 @@ import org.sonar.server.tester.UserSessionRule;
 import org.sonar.server.ws.TestRequest;
 import org.sonar.server.ws.WsActionTester;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doThrow;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/license/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/license/ws/ListActionTest.java
index 53256165c48..b609172e9b7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/license/ws/ListActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/license/ws/ListActionTest.java
@@ -43,7 +43,7 @@ import org.sonarqube.ws.Licenses;
 import org.sonarqube.ws.Licenses.ListWsResponse;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Java6Assertions.entry;
+import static org.assertj.core.api.Assertions.entry;
 import static org.sonar.api.CoreProperties.PERMANENT_SERVER_ID;
 import static org.sonar.api.PropertyType.LICENSE;
 import static org.sonar.db.property.PropertyTesting.newGlobalPropertyDto;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/web/RootFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/web/RootFilterTest.java
index 4fcb8ed519b..c7ccd7d44ba 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/web/RootFilterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/web/RootFilterTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java
index 98ec8206615..4b9e66207f7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java
@@ -29,7 +29,7 @@ import org.sonar.db.DbTester;
 import org.sonar.db.qualitygate.QualityGateDto;
 import org.sonar.server.exceptions.BadRequestException;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class QualityGateUpdaterTest {
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java
index 3f9a127fcdb..45ad8ed38ef 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java
@@ -45,7 +45,7 @@ import org.sonar.server.ws.WsActionTester;
 import org.sonarqube.ws.MediaTypes;
 import org.sonarqube.ws.WsQualityGates.CreateConditionWsResponse;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.db.metric.MetricTesting.newMetricDto;
 import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
 import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.PERCENT;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java
index 208d770fc5b..9f223c46fda 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java
@@ -45,7 +45,7 @@ import org.sonar.server.ws.WsActionTester;
 import org.sonarqube.ws.MediaTypes;
 import org.sonarqube.ws.WsQualityGates.CreateConditionWsResponse;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.db.metric.MetricTesting.newMetricDto;
 import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
 import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.PERCENT;
diff --git a/tests/perf/pom.xml b/tests/perf/pom.xml
deleted file mode 100644
index 1ab63a74b47..00000000000
--- a/tests/perf/pom.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>tests</artifactId>
-    <version>6.5-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>perf</artifactId>
-  <name>SonarQube :: Performance Tests</name>
-
-  <properties>
-    <category>*</category>
-    <sqZipDir>../../sonar-application/target</sqZipDir>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>-Dsonar.runtimeVersion=${project.version}</argLine>
-          <includes>
-            <include>org/sonarsource/sonarqube/perf/${category}/suite/*TestSuite.java</include>
-            <!-- not included in suites -->
-            <include>org/sonarsource/sonarqube/perf/${category}/*Test.java</include>
-          </includes>
-          <excludes>
-            <!-- included into suites -->
-            <exclude>org/sonarsource/sonarqube/perf/*/suite/*Test.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-application</artifactId>
-      <version>${project.version}</version>
-      <type>zip</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.sonarsource.orchestrator</groupId>
-      <artifactId>sonar-orchestrator</artifactId>
-      <version>${orchestrator.version}</version>
-    </dependency>
-    <dependency>
-      <!-- required for downloading the scanner used
-      by some performance tests -->
-      <groupId>org.codehaus.sonar.runner</groupId>
-      <artifactId>sonar-runner-dist</artifactId>
-      <version>2.4</version>
-      <type>zip</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-update-center-common</artifactId>
-      <version>1.12.1</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-ws</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-      <version>2.6</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.11</version>
-    </dependency>
-    <dependency>
-      <groupId>com.github.kevinsawicki</groupId>
-      <artifactId>http-request</artifactId>
-      <version>5.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.easytesting</groupId>
-      <artifactId>fest-assert</artifactId>
-      <version>1.4</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <profiles>
-    <profile>
-      <id>qa</id>
-      <activation>
-        <property>
-          <name>env.SONARSOURCE_QA</name>
-          <value>true</value>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>copy-xoo-plugin</id>
-                <phase>generate-test-resources</phase>
-                <goals>
-                  <goal>copy</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>${project.groupId}</groupId>
-                      <artifactId>sonar-xoo-plugin</artifactId>
-                      <version>${project.version}</version>
-                      <type>sonar-plugin</type>
-                      <overWrite>true</overWrite>
-                    </artifactItem>
-                  </artifactItems>
-                  <outputDirectory>../../plugins/sonar-xoo-plugin/target</outputDirectory>
-                  <overWriteReleases>true</overWriteReleases>
-                  <overWriteSnapshots>true</overWriteSnapshots>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-  </profiles>
-</project>
diff --git a/tests/perf/src/main/resources/selenium/rename_findbugs_profile.html b/tests/perf/src/main/resources/selenium/rename_findbugs_profile.html
deleted file mode 100644
index 849f8cb7ec5..00000000000
--- a/tests/perf/src/main/resources/selenium/rename_findbugs_profile.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>rename_findbugs_profile</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <thead>
-    <tr>
-        <td rowspan="1" colspan="3">rename_findbugs_profile</td>
-    </tr>
-    </thead>
-    <tbody>
-    <tr>
-	<td>open</td>
-	<td>/sessions/new</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>login</td>
-	<td>admin</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>password</td>
-	<td>admin</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>commit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>open</td>
-	<td>/profiles</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>id=rename-java_sonar-way-with-findbugs</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForElementPresent</td>
-	<td>id=new-name</td>
-	<td></td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>id=new-name</td>
-	<td>findbugs-profile</td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>id=rename-submit</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertText</td>
-	<td>profiles_java</td>
-	<td>*findbugs-profile*</td>
-</tr>
-</tbody>
-</table>
-</body>
-</html>
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/WebTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/WebTest.java
deleted file mode 100644
index 3545682b2fc..00000000000
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/WebTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2017 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package org.sonarsource.sonarqube.perf.server;
-
-import com.github.kevinsawicki.http.HttpRequest;
-import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.build.MavenBuild;
-import com.sonar.orchestrator.locator.FileLocation;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.sonarsource.sonarqube.perf.PerfTestCase;
-
-import static org.junit.Assert.fail;
-
-@Ignore("Temporarily disabled as it requires access to IT_SOURCES")
-public class WebTest extends PerfTestCase {
-
-  static final int DEFAULT_PAGE_TIMEOUT_MS = 1000;
-
-  @ClassRule
-  public static Orchestrator orchestrator = Orchestrator.builderEnv()
-    .setOrchestratorProperty("javaVersion", "LATEST_RELEASE")
-    .addPlugin("java")
-    .restoreProfileAtStartup(FileLocation.ofClasspath("/java-quality-profile.xml"))
-    .build();
-
-  @BeforeClass
-  public static void scan_struts() throws Exception {
-    FileLocation strutsHome = orchestrator.getFileLocationOfShared("it-sonar-performancing/struts-1.3.9/pom.xml");
-    MavenBuild scan = MavenBuild.create(strutsHome.getFile());
-    scan.setGoals("sonar:sonar -V");
-    scan.setEnvironmentVariable("MAVEN_OPTS", "-Xmx512m -server");
-    scan.setProperty("sonar.scm.disabled", "true");
-    scan.setProperty("sonar.sourceEncoding", "UTF-8");
-    orchestrator.executeBuild(scan);
-  }
-
-  @Test
-  public void homepage() throws Exception {
-    PageStats counters = request("/");
-    assertDurationLessThan(counters.durationMs, 300);
-  }
-
-  @Test
-  public void quality_profiles() throws Exception {
-    PageStats counters = request("/profiles");
-    assertDurationLessThan(counters.durationMs, DEFAULT_PAGE_TIMEOUT_MS);
-  }
-
-  @Test
-  public void issues_search() throws Exception {
-    PageStats counters = request("/issues");
-    assertDurationLessThan(counters.durationMs, 300);
-  }
-
-  @Test
-  public void measures_search() throws Exception {
-    PageStats counters = request("/measures");
-    assertDurationLessThan(counters.durationMs, 550);
-  }
-
-  @Test
-  public void all_projects() throws Exception {
-    PageStats counters = request("/all_projects?qualifier=TRK");
-    assertDurationLessThan(counters.durationMs, 300);
-  }
-
-  @Test
-  public void project_measures_search() throws Exception {
-    PageStats counters = request("/measures/search?qualifiers[]=TRK");
-    assertDurationLessThan(counters.durationMs, 300);
-  }
-
-  @Test
-  public void file_measures_search() throws Exception {
-    PageStats counters = request("/measures/search?qualifiers[]=FIL");
-    assertDurationLessThan(counters.durationMs, 500);
-  }
-
-  @Test
-  public void struts_dashboard() throws Exception {
-    PageStats counters = request("/dashboard?id=org.apache.struts:struts-parent?name=Custom");
-    assertDurationLessThan(counters.durationMs, 400);
-  }
-
-  @Test
-  public void struts_issues() throws Exception {
-    PageStats counters = request("/issues?componentKeys=org.apache.struts:struts-parent");
-    assertDurationLessThan(counters.durationMs, 300);
-  }
-
-  @Test
-  public void struts_issues_drilldown() throws Exception {
-    PageStats counters = request("/drilldown/issues/org.apache.struts:struts-parent");
-    assertDurationLessThan(counters.durationMs, 400);
-  }
-
-  @Test
-  public void struts_measures_drilldown() throws Exception {
-    PageStats counters = request("/drilldown/measures/org.apache.struts:struts-parent?metric=ncloc");
-    // sounds too high !
-    assertDurationLessThan(counters.durationMs, DEFAULT_PAGE_TIMEOUT_MS);
-  }
-
-  @Test
-  public void struts_debt_overview() throws Exception {
-    PageStats counters = request("/overview/issues?id=org.apache.struts:struts-parent");
-    assertDurationLessThan(counters.durationMs, DEFAULT_PAGE_TIMEOUT_MS);
-  }
-
-  @Test
-  public void stylesheet_file() throws Exception {
-    PageStats counters = request("/css/sonar.css");
-    assertDurationLessThan(counters.durationMs, 40);
-  }
-
-  @Test
-  public void javascript_file() throws Exception {
-    PageStats counters = request("/js/bundles/sonar.js");
-    assertDurationLessThan(counters.durationMs, 40);
-  }
-
-  PageStats request(String path) {
-    String url = orchestrator.getServer().getUrl() + path;
-
-    // warm-up
-    for (int i = 0; i < 5; i++) {
-      newRequest(url).code();
-    }
-
-    long targetDuration = Long.MAX_VALUE;
-    long targetSize = 0L;
-    for (int i = 0; i < 10; i++) {
-      HttpRequest request = newRequest(url);
-      long start = System.currentTimeMillis();
-      if (request.ok()) {
-        long duration = System.currentTimeMillis() - start;
-        int size = request.body().length();
-
-        if (duration < targetDuration) {
-          targetDuration = duration;
-          targetSize = size;
-        }
-        System.out.printf("##### Page %50s %7d ms %7d bytes\n", path, duration, size);
-      }
-    }
-    if (targetDuration == Long.MAX_VALUE) {
-      fail(String.format("Failed to load page: %s", url));
-    }
-    return new PageStats(targetDuration, targetSize);
-  }
-
-  private HttpRequest newRequest(String url) {
-    HttpRequest request = HttpRequest.get(url);
-    request.followRedirects(false).acceptJson().acceptCharset(HttpRequest.CHARSET_UTF8);
-    return request;
-  }
-
-  static class PageStats {
-    long durationMs;
-    long sizeBytes;
-
-    PageStats(long durationMs, long sizeBytes) {
-      this.durationMs = durationMs;
-      this.sizeBytes = sizeBytes;
-    }
-  }
-}
diff --git a/tests/perf/src/test/resources/java-quality-profile.xml b/tests/perf/src/test/resources/java-quality-profile.xml
deleted file mode 100644
index f9a32d71442..00000000000
--- a/tests/perf/src/test/resources/java-quality-profile.xml
+++ /dev/null
@@ -1,1111 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<profile>
-  <name>Sonar way</name>
-  <language>java</language>
-  <rules>
-    <rule>
-      <repositoryKey>common-java</repositoryKey>
-      <key>DuplicatedBlocks</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>common-java</repositoryKey>
-      <key>InsufficientBranchCoverage</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>minimumBranchCoverageRatio</key>
-          <value>65.0</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00105</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>MethodCyclomaticComplexity</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>max</key>
-          <value>10</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ClassCyclomaticComplexity</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>max</key>
-          <value>200</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>CommentedOutCodeLine</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00108</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00107</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>maximumMethodParameters</key>
-          <value>7</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00112</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00100</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[a-z][a-zA-Z0-9]*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00101</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[A-Z][a-zA-Z0-9]*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00114</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[A-Z][a-zA-Z0-9]*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00115</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00116</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[a-z][a-zA-Z0-9]*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00117</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[a-z][a-zA-Z0-9]*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00119</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[A-Z]$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00120</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[a-z]+(\.[a-z][a-z0-9]*)*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00122</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>RightCurlyBraceStartLineCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>UselessParenthesesCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ObjectFinalizeCheck</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ObjectFinalizeOverridenCheck</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ObjectFinalizeOverridenCallsSuperFinalizeCheck</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ClassVariableVisibilityCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ForLoopCounterChangedCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>LabelsShouldNotBeUsedCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>SwitchLastCaseIsDefaultCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>EmptyStatementUsageCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ModifiersOrderCheck</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>AssignmentInSubExpressionCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>UselessImportCheck</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>LowerCaseLongSuffixCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>MissingDeprecatedCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>HiddenFieldCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1133</key>
-      <priority>INFO</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1134</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1135</key>
-      <priority>INFO</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1118</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1132</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1126</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1125</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1067</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>max</key>
-          <value>3</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1141</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1147</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1143</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1145</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1157</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1155</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1149</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1171</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1168</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1170</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1163</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S106</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1165</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1066</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S134</key>
-      <priority>MINOR</priority>
-      <parameters>
-        <parameter>
-          <key>max</key>
-          <value>3</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1181</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1150</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1182</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1151</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>max</key>
-          <value>5</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S128</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1166</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>exceptions</key>
-          <value>java.lang.InterruptedException, java.lang.NumberFormatException, java.text.ParseException,
-            java.net.MalformedURLException
-          </value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1190</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1188</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>max</key>
-          <value>20</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1191</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S135</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1186</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1185</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1174</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1175</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1153</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1148</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1195</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1194</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1193</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1192</key>
-      <priority>MINOR</priority>
-      <parameters>
-        <parameter>
-          <key>threshold</key>
-          <value>3</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1158</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1215</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1197</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1220</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1221</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1199</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1214</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1201</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1210</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1206</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1219</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1301</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1314</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1226</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1313</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1312</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>LOG(?:GER)?</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1318</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1223</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1319</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1213</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1444</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1452</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1481</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1068</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1317</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1596</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>UnusedPrivateMethod</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>RedundantThrowsDeclarationCheck</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1160</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1217</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1862</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1488</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1602</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1611</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1700</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1172</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1294</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1598</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1873</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1948</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1479</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>maximum</key>
-          <value>30</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1764</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1244</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2077</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1161</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1994</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2094</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1850</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1905</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2114</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1065</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2184</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2225</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2230</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2200</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2092</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1848</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2235</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S888</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2068</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2232</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1849</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2236</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1844</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2251</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2252</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2254</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2226</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2250</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2111</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2109</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2273</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2276</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2274</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2272</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2277</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2204</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2178</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2116</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2157</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2275</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2151</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2127</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1860</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2055</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2118</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2066</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2065</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2061</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2176</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-  </rules>
-</profile>
diff --git a/it/it-plugins/access-secured-props-plugin/pom.xml b/tests/plugins/access-secured-props-plugin/pom.xml
index fcac07498c9..2b5c86d4065 100644
--- a/it/it-plugins/access-secured-props-plugin/pom.xml
+++ b/tests/plugins/access-secured-props-plugin/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/access-secured-props-plugin/src/main/java/AccessSecuredPropsPlugin.java b/tests/plugins/access-secured-props-plugin/src/main/java/AccessSecuredPropsPlugin.java
index a4e7da75764..a4e7da75764 100644
--- a/it/it-plugins/access-secured-props-plugin/src/main/java/AccessSecuredPropsPlugin.java
+++ b/tests/plugins/access-secured-props-plugin/src/main/java/AccessSecuredPropsPlugin.java
diff --git a/it/it-plugins/access-secured-props-plugin/src/main/java/AccessSecuredPropsSensor.java b/tests/plugins/access-secured-props-plugin/src/main/java/AccessSecuredPropsSensor.java
index 9aca5155bb9..9aca5155bb9 100644
--- a/it/it-plugins/access-secured-props-plugin/src/main/java/AccessSecuredPropsSensor.java
+++ b/tests/plugins/access-secured-props-plugin/src/main/java/AccessSecuredPropsSensor.java
diff --git a/it/it-plugins/access-secured-props-plugin/src/main/java/AccessSecuredPropsTaskExtension.java b/tests/plugins/access-secured-props-plugin/src/main/java/AccessSecuredPropsTaskExtension.java
index 0132b56eefb..0132b56eefb 100644
--- a/it/it-plugins/access-secured-props-plugin/src/main/java/AccessSecuredPropsTaskExtension.java
+++ b/tests/plugins/access-secured-props-plugin/src/main/java/AccessSecuredPropsTaskExtension.java
diff --git a/it/it-plugins/base-auth-plugin/pom.xml b/tests/plugins/base-auth-plugin/pom.xml
index c825b92a94e..b9ba09d79ab 100644
--- a/it/it-plugins/base-auth-plugin/pom.xml
+++ b/tests/plugins/base-auth-plugin/pom.xml
@@ -4,8 +4,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/base-auth-plugin/src/main/java/FakeBaseAuthPlugin.java b/tests/plugins/base-auth-plugin/src/main/java/FakeBaseAuthPlugin.java
index ee04f716930..ee04f716930 100644
--- a/it/it-plugins/base-auth-plugin/src/main/java/FakeBaseAuthPlugin.java
+++ b/tests/plugins/base-auth-plugin/src/main/java/FakeBaseAuthPlugin.java
diff --git a/it/it-plugins/base-auth-plugin/src/main/java/FakeBaseIdProvider.java b/tests/plugins/base-auth-plugin/src/main/java/FakeBaseIdProvider.java
index 2e191e1e306..2e191e1e306 100644
--- a/it/it-plugins/base-auth-plugin/src/main/java/FakeBaseIdProvider.java
+++ b/tests/plugins/base-auth-plugin/src/main/java/FakeBaseIdProvider.java
diff --git a/it/it-plugins/base-auth-plugin/src/main/resources/static/base.png b/tests/plugins/base-auth-plugin/src/main/resources/static/base.png
index 217d2a0bdf8..217d2a0bdf8 100644
--- a/it/it-plugins/base-auth-plugin/src/main/resources/static/base.png
+++ b/tests/plugins/base-auth-plugin/src/main/resources/static/base.png
diff --git a/it/it-plugins/base-auth-plugin/src/resources/static/base.png b/tests/plugins/base-auth-plugin/src/resources/static/base.png
index 217d2a0bdf8..217d2a0bdf8 100644
--- a/it/it-plugins/base-auth-plugin/src/resources/static/base.png
+++ b/tests/plugins/base-auth-plugin/src/resources/static/base.png
diff --git a/it/it-plugins/batch-plugin/pom.xml b/tests/plugins/batch-plugin/pom.xml
index 084bd61edc9..98b839b6bde 100644
--- a/it/it-plugins/batch-plugin/pom.xml
+++ b/tests/plugins/batch-plugin/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/BatchPlugin.java b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/BatchPlugin.java
index 08f533ecea0..08f533ecea0 100644
--- a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/BatchPlugin.java
+++ b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/BatchPlugin.java
diff --git a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/DumpSettingsInitializer.java b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/DumpSettingsInitializer.java
index 5149d72779c..5149d72779c 100644
--- a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/DumpSettingsInitializer.java
+++ b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/DumpSettingsInitializer.java
diff --git a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/RaiseMessageException.java b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/RaiseMessageException.java
index a1acf47fb39..a1acf47fb39 100644
--- a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/RaiseMessageException.java
+++ b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/RaiseMessageException.java
diff --git a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/TempFolderExtension.java b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/TempFolderExtension.java
index 1549471ff0f..1549471ff0f 100644
--- a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/TempFolderExtension.java
+++ b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/TempFolderExtension.java
diff --git a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/WaitingSensor.java b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/WaitingSensor.java
index a498e8534aa..a498e8534aa 100644
--- a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/WaitingSensor.java
+++ b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/WaitingSensor.java
diff --git a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleMeasureComputer.java b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleMeasureComputer.java
index 38140cd597f..38140cd597f 100644
--- a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleMeasureComputer.java
+++ b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleMeasureComputer.java
diff --git a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleMetric.java b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleMetric.java
index aa2454b2a89..aa2454b2a89 100644
--- a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleMetric.java
+++ b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleMetric.java
diff --git a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleProperty.java b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleProperty.java
index c070434eeec..c070434eeec 100644
--- a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleProperty.java
+++ b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleProperty.java
diff --git a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleSensor.java b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleSensor.java
index 788627bb920..788627bb920 100644
--- a/it/it-plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleSensor.java
+++ b/tests/plugins/batch-plugin/src/main/java/com/sonarsource/decimal_scale_of_measures/DecimalScaleSensor.java
diff --git a/it/it-plugins/extension-lifecycle-plugin/pom.xml b/tests/plugins/extension-lifecycle-plugin/pom.xml
index a33dc0cbf43..4d8adecd830 100644
--- a/it/it-plugins/extension-lifecycle-plugin/pom.xml
+++ b/tests/plugins/extension-lifecycle-plugin/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
   <artifactId>extension-lifecycle-plugin</artifactId>
diff --git a/it/it-plugins/extension-lifecycle-plugin/src/main/java/BatchService.java b/tests/plugins/extension-lifecycle-plugin/src/main/java/BatchService.java
index 3ab267e6f16..3ab267e6f16 100644
--- a/it/it-plugins/extension-lifecycle-plugin/src/main/java/BatchService.java
+++ b/tests/plugins/extension-lifecycle-plugin/src/main/java/BatchService.java
diff --git a/it/it-plugins/extension-lifecycle-plugin/src/main/java/ExtensionLifecyclePlugin.java b/tests/plugins/extension-lifecycle-plugin/src/main/java/ExtensionLifecyclePlugin.java
index 4c12f9f519b..4c12f9f519b 100644
--- a/it/it-plugins/extension-lifecycle-plugin/src/main/java/ExtensionLifecyclePlugin.java
+++ b/tests/plugins/extension-lifecycle-plugin/src/main/java/ExtensionLifecyclePlugin.java
diff --git a/it/it-plugins/extension-lifecycle-plugin/src/main/java/ProjectService.java b/tests/plugins/extension-lifecycle-plugin/src/main/java/ProjectService.java
index 93fcfe61403..93fcfe61403 100644
--- a/it/it-plugins/extension-lifecycle-plugin/src/main/java/ProjectService.java
+++ b/tests/plugins/extension-lifecycle-plugin/src/main/java/ProjectService.java
diff --git a/it/it-plugins/extension-lifecycle-plugin/src/main/java/ServerService.java b/tests/plugins/extension-lifecycle-plugin/src/main/java/ServerService.java
index f4db1a98555..f4db1a98555 100644
--- a/it/it-plugins/extension-lifecycle-plugin/src/main/java/ServerService.java
+++ b/tests/plugins/extension-lifecycle-plugin/src/main/java/ServerService.java
diff --git a/it/it-plugins/fake-billing-plugin/pom.xml b/tests/plugins/fake-billing-plugin/pom.xml
index abba2724aac..6236c8cf5c4 100644
--- a/it/it-plugins/fake-billing-plugin/pom.xml
+++ b/tests/plugins/fake-billing-plugin/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/fake-billing-plugin/src/main/java/FakeBillingPlugin.java b/tests/plugins/fake-billing-plugin/src/main/java/FakeBillingPlugin.java
index 910dfc9998a..910dfc9998a 100644
--- a/it/it-plugins/fake-billing-plugin/src/main/java/FakeBillingPlugin.java
+++ b/tests/plugins/fake-billing-plugin/src/main/java/FakeBillingPlugin.java
diff --git a/it/it-plugins/fake-billing-plugin/src/main/java/FakeBillingValidations.java b/tests/plugins/fake-billing-plugin/src/main/java/FakeBillingValidations.java
index 8ce39311117..8ce39311117 100644
--- a/it/it-plugins/fake-billing-plugin/src/main/java/FakeBillingValidations.java
+++ b/tests/plugins/fake-billing-plugin/src/main/java/FakeBillingValidations.java
diff --git a/it/it-plugins/fake-billing-plugin/src/main/resources/org/sonar/l10n/billing.properties b/tests/plugins/fake-billing-plugin/src/main/resources/org/sonar/l10n/billing.properties
index f8ac8fcaef5..f8ac8fcaef5 100644
--- a/it/it-plugins/fake-billing-plugin/src/main/resources/org/sonar/l10n/billing.properties
+++ b/tests/plugins/fake-billing-plugin/src/main/resources/org/sonar/l10n/billing.properties
diff --git a/it/it-plugins/global-property-change-plugin/pom.xml b/tests/plugins/global-property-change-plugin/pom.xml
index 493e138032a..7ab52654091 100644
--- a/it/it-plugins/global-property-change-plugin/pom.xml
+++ b/tests/plugins/global-property-change-plugin/pom.xml
@@ -4,8 +4,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/global-property-change-plugin/src/main/java/FakeGlobalPropertyChange.java b/tests/plugins/global-property-change-plugin/src/main/java/FakeGlobalPropertyChange.java
index 551ed92f676..551ed92f676 100644
--- a/it/it-plugins/global-property-change-plugin/src/main/java/FakeGlobalPropertyChange.java
+++ b/tests/plugins/global-property-change-plugin/src/main/java/FakeGlobalPropertyChange.java
diff --git a/it/it-plugins/global-property-change-plugin/src/main/java/GlobalPropertyChangePlugin.java b/tests/plugins/global-property-change-plugin/src/main/java/GlobalPropertyChangePlugin.java
index 5332fc9a3a5..5332fc9a3a5 100644
--- a/it/it-plugins/global-property-change-plugin/src/main/java/GlobalPropertyChangePlugin.java
+++ b/tests/plugins/global-property-change-plugin/src/main/java/GlobalPropertyChangePlugin.java
diff --git a/it/it-plugins/issue-filter-plugin/pom.xml b/tests/plugins/issue-filter-plugin/pom.xml
index 8569a7a3ba3..9b492158abf 100644
--- a/it/it-plugins/issue-filter-plugin/pom.xml
+++ b/tests/plugins/issue-filter-plugin/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/issue-filter-plugin/src/main/java/IssueFilterBeforeLine5.java b/tests/plugins/issue-filter-plugin/src/main/java/IssueFilterBeforeLine5.java
index 44d34cba722..44d34cba722 100644
--- a/it/it-plugins/issue-filter-plugin/src/main/java/IssueFilterBeforeLine5.java
+++ b/tests/plugins/issue-filter-plugin/src/main/java/IssueFilterBeforeLine5.java
diff --git a/it/it-plugins/issue-filter-plugin/src/main/java/IssueFilterPlugin.java b/tests/plugins/issue-filter-plugin/src/main/java/IssueFilterPlugin.java
index 94d5b87396e..94d5b87396e 100644
--- a/it/it-plugins/issue-filter-plugin/src/main/java/IssueFilterPlugin.java
+++ b/tests/plugins/issue-filter-plugin/src/main/java/IssueFilterPlugin.java
diff --git a/it/it-plugins/issue-filter-plugin/src/main/java/ModuleIssueFilter.java b/tests/plugins/issue-filter-plugin/src/main/java/ModuleIssueFilter.java
index 48f549a264e..48f549a264e 100644
--- a/it/it-plugins/issue-filter-plugin/src/main/java/ModuleIssueFilter.java
+++ b/tests/plugins/issue-filter-plugin/src/main/java/ModuleIssueFilter.java
diff --git a/it/it-plugins/l10n-fr-pack/pom.xml b/tests/plugins/l10n-fr-pack/pom.xml
index 33c8472b8b1..c952197ed95 100644
--- a/it/it-plugins/l10n-fr-pack/pom.xml
+++ b/tests/plugins/l10n-fr-pack/pom.xml
@@ -4,8 +4,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
   
diff --git a/it/it-plugins/l10n-fr-pack/src/main/java/SimpleFrenchPackPlugin.java b/tests/plugins/l10n-fr-pack/src/main/java/SimpleFrenchPackPlugin.java
index 221e7131a90..221e7131a90 100644
--- a/it/it-plugins/l10n-fr-pack/src/main/java/SimpleFrenchPackPlugin.java
+++ b/tests/plugins/l10n-fr-pack/src/main/java/SimpleFrenchPackPlugin.java
diff --git a/it/it-plugins/l10n-fr-pack/src/main/resources/org/sonar/l10n/core_fr.properties b/tests/plugins/l10n-fr-pack/src/main/resources/org/sonar/l10n/core_fr.properties
index 2d28afe84f0..2d28afe84f0 100644
--- a/it/it-plugins/l10n-fr-pack/src/main/resources/org/sonar/l10n/core_fr.properties
+++ b/tests/plugins/l10n-fr-pack/src/main/resources/org/sonar/l10n/core_fr.properties
diff --git a/it/it-plugins/license-plugin/pom.xml b/tests/plugins/license-plugin/pom.xml
index 72b711a3c74..784132bf658 100644
--- a/it/it-plugins/license-plugin/pom.xml
+++ b/tests/plugins/license-plugin/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/license-plugin/src/main/java/LicensePlugin.java b/tests/plugins/license-plugin/src/main/java/LicensePlugin.java
index 9bd74374f37..9bd74374f37 100644
--- a/it/it-plugins/license-plugin/src/main/java/LicensePlugin.java
+++ b/tests/plugins/license-plugin/src/main/java/LicensePlugin.java
diff --git a/it/it-plugins/oauth2-auth-plugin/pom.xml b/tests/plugins/oauth2-auth-plugin/pom.xml
index 2fa5a35a102..565b1445bf4 100644
--- a/it/it-plugins/oauth2-auth-plugin/pom.xml
+++ b/tests/plugins/oauth2-auth-plugin/pom.xml
@@ -4,8 +4,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/oauth2-auth-plugin/src/main/java/FakeOAuth2AuthPlugin.java b/tests/plugins/oauth2-auth-plugin/src/main/java/FakeOAuth2AuthPlugin.java
index 5fa419d3289..5fa419d3289 100644
--- a/it/it-plugins/oauth2-auth-plugin/src/main/java/FakeOAuth2AuthPlugin.java
+++ b/tests/plugins/oauth2-auth-plugin/src/main/java/FakeOAuth2AuthPlugin.java
diff --git a/it/it-plugins/oauth2-auth-plugin/src/main/java/FakeOAuth2IdProvider.java b/tests/plugins/oauth2-auth-plugin/src/main/java/FakeOAuth2IdProvider.java
index deb426145c4..deb426145c4 100644
--- a/it/it-plugins/oauth2-auth-plugin/src/main/java/FakeOAuth2IdProvider.java
+++ b/tests/plugins/oauth2-auth-plugin/src/main/java/FakeOAuth2IdProvider.java
diff --git a/it/it-plugins/oauth2-auth-plugin/src/main/resources/static/oauth2.png b/tests/plugins/oauth2-auth-plugin/src/main/resources/static/oauth2.png
index 28a3e01698c..28a3e01698c 100644
--- a/it/it-plugins/oauth2-auth-plugin/src/main/resources/static/oauth2.png
+++ b/tests/plugins/oauth2-auth-plugin/src/main/resources/static/oauth2.png
diff --git a/it/it-plugins/pom.xml b/tests/plugins/pom.xml
index 72c254d4593..2f41319fe52 100644
--- a/it/it-plugins/pom.xml
+++ b/tests/plugins/pom.xml
@@ -5,14 +5,24 @@
 
   <parent>
     <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it</artifactId>
+    <artifactId>sonarqube</artifactId>
     <version>6.5-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
-  <artifactId>it-plugins</artifactId>
+  <groupId>org.sonarsource.sonarqube.tests</groupId>
+  <artifactId>plugins</artifactId>
   <name>SonarQube Integration Tests :: Plugins</name>
   <description>The fake plugins used by integration tests</description>
   <packaging>pom</packaging>
 
+  <properties>
+    <skipSanityChecks>true</skipSanityChecks>
+    <enforcer.skip>true</enforcer.skip>
+    <maven.deploy.skip>true</maven.deploy.skip>
+    <source.skip>true</source.skip>
+    <apiVersion>${project.parent.version}</apiVersion>
+  </properties>
+
   <build>
     <plugins>
       <plugin>
@@ -25,10 +35,6 @@
     </plugins>
   </build>
 
-  <properties>
-    <apiVersion>${project.parent.version}</apiVersion>
-  </properties>
-
   <modules>
     <module>access-secured-props-plugin</module>
     <module>base-auth-plugin</module>
diff --git a/it/it-plugins/posttask-plugin/pom.xml b/tests/plugins/posttask-plugin/pom.xml
index 14bc046d194..a7fa06d39b8 100644
--- a/it/it-plugins/posttask-plugin/pom.xml
+++ b/tests/plugins/posttask-plugin/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/posttask-plugin/src/main/java/AddScannerContextSensor.java b/tests/plugins/posttask-plugin/src/main/java/AddScannerContextSensor.java
index 7013a6707a8..7013a6707a8 100644
--- a/it/it-plugins/posttask-plugin/src/main/java/AddScannerContextSensor.java
+++ b/tests/plugins/posttask-plugin/src/main/java/AddScannerContextSensor.java
diff --git a/it/it-plugins/posttask-plugin/src/main/java/LogScannerContextPostTask.java b/tests/plugins/posttask-plugin/src/main/java/LogScannerContextPostTask.java
index 120610a2da2..120610a2da2 100644
--- a/it/it-plugins/posttask-plugin/src/main/java/LogScannerContextPostTask.java
+++ b/tests/plugins/posttask-plugin/src/main/java/LogScannerContextPostTask.java
diff --git a/it/it-plugins/posttask-plugin/src/main/java/PostProjectAnalysisTaskImpl.java b/tests/plugins/posttask-plugin/src/main/java/PostProjectAnalysisTaskImpl.java
index 0c288ec01d5..0c288ec01d5 100644
--- a/it/it-plugins/posttask-plugin/src/main/java/PostProjectAnalysisTaskImpl.java
+++ b/tests/plugins/posttask-plugin/src/main/java/PostProjectAnalysisTaskImpl.java
diff --git a/it/it-plugins/posttask-plugin/src/main/java/PostTaskPlugin.java b/tests/plugins/posttask-plugin/src/main/java/PostTaskPlugin.java
index 07ce105ff4e..07ce105ff4e 100644
--- a/it/it-plugins/posttask-plugin/src/main/java/PostTaskPlugin.java
+++ b/tests/plugins/posttask-plugin/src/main/java/PostTaskPlugin.java
diff --git a/it/it-plugins/project-builder-plugin/pom.xml b/tests/plugins/project-builder-plugin/pom.xml
index 69f94355cf5..9afdc7a8993 100644
--- a/it/it-plugins/project-builder-plugin/pom.xml
+++ b/tests/plugins/project-builder-plugin/pom.xml
@@ -3,8 +3,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
   <artifactId>project-builder-plugin</artifactId>
diff --git a/it/it-plugins/project-builder-plugin/src/main/java/CreateSubProjects.java b/tests/plugins/project-builder-plugin/src/main/java/CreateSubProjects.java
index e1fe412282d..e1fe412282d 100644
--- a/it/it-plugins/project-builder-plugin/src/main/java/CreateSubProjects.java
+++ b/tests/plugins/project-builder-plugin/src/main/java/CreateSubProjects.java
diff --git a/it/it-plugins/project-builder-plugin/src/main/java/ProjectBuilderPlugin.java b/tests/plugins/project-builder-plugin/src/main/java/ProjectBuilderPlugin.java
index f57669929d3..f57669929d3 100644
--- a/it/it-plugins/project-builder-plugin/src/main/java/ProjectBuilderPlugin.java
+++ b/tests/plugins/project-builder-plugin/src/main/java/ProjectBuilderPlugin.java
diff --git a/it/it-plugins/project-builder-plugin/src/main/java/RenameProject.java b/tests/plugins/project-builder-plugin/src/main/java/RenameProject.java
index 22d1dd3cccb..22d1dd3cccb 100644
--- a/it/it-plugins/project-builder-plugin/src/main/java/RenameProject.java
+++ b/tests/plugins/project-builder-plugin/src/main/java/RenameProject.java
diff --git a/it/it-plugins/property-relocation-plugin/pom.xml b/tests/plugins/property-relocation-plugin/pom.xml
index 932eaf6f101..28699399fd5 100644
--- a/it/it-plugins/property-relocation-plugin/pom.xml
+++ b/tests/plugins/property-relocation-plugin/pom.xml
@@ -4,8 +4,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/property-relocation-plugin/src/main/java/CheckProperties.java b/tests/plugins/property-relocation-plugin/src/main/java/CheckProperties.java
index b4e7ec1b185..b4e7ec1b185 100644
--- a/it/it-plugins/property-relocation-plugin/src/main/java/CheckProperties.java
+++ b/tests/plugins/property-relocation-plugin/src/main/java/CheckProperties.java
diff --git a/it/it-plugins/property-relocation-plugin/src/main/java/PropertyRelocationPlugin.java b/tests/plugins/property-relocation-plugin/src/main/java/PropertyRelocationPlugin.java
index aa0ebbfae38..aa0ebbfae38 100644
--- a/it/it-plugins/property-relocation-plugin/src/main/java/PropertyRelocationPlugin.java
+++ b/tests/plugins/property-relocation-plugin/src/main/java/PropertyRelocationPlugin.java
diff --git a/it/it-plugins/property-sets-plugin/pom.xml b/tests/plugins/property-sets-plugin/pom.xml
index b2d3e1e166d..36c61ea2cc9 100644
--- a/it/it-plugins/property-sets-plugin/pom.xml
+++ b/tests/plugins/property-sets-plugin/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/property-sets-plugin/src/main/java/PropertySetsPlugin.java b/tests/plugins/property-sets-plugin/src/main/java/PropertySetsPlugin.java
index 357411d6980..357411d6980 100644
--- a/it/it-plugins/property-sets-plugin/src/main/java/PropertySetsPlugin.java
+++ b/tests/plugins/property-sets-plugin/src/main/java/PropertySetsPlugin.java
diff --git a/it/it-plugins/security-plugin/pom.xml b/tests/plugins/security-plugin/pom.xml
index c868eaeb5df..bc4885967e6 100644
--- a/it/it-plugins/security-plugin/pom.xml
+++ b/tests/plugins/security-plugin/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/security-plugin/src/main/java/FakeAuthenticator.java b/tests/plugins/security-plugin/src/main/java/FakeAuthenticator.java
index 890263b0fbf..890263b0fbf 100644
--- a/it/it-plugins/security-plugin/src/main/java/FakeAuthenticator.java
+++ b/tests/plugins/security-plugin/src/main/java/FakeAuthenticator.java
diff --git a/it/it-plugins/security-plugin/src/main/java/FakeGroupsProvider.java b/tests/plugins/security-plugin/src/main/java/FakeGroupsProvider.java
index 3ab14818a34..3ab14818a34 100644
--- a/it/it-plugins/security-plugin/src/main/java/FakeGroupsProvider.java
+++ b/tests/plugins/security-plugin/src/main/java/FakeGroupsProvider.java
diff --git a/it/it-plugins/security-plugin/src/main/java/FakeRealm.java b/tests/plugins/security-plugin/src/main/java/FakeRealm.java
index 152ea921b21..152ea921b21 100644
--- a/it/it-plugins/security-plugin/src/main/java/FakeRealm.java
+++ b/tests/plugins/security-plugin/src/main/java/FakeRealm.java
diff --git a/it/it-plugins/security-plugin/src/main/java/FakeUsersProvider.java b/tests/plugins/security-plugin/src/main/java/FakeUsersProvider.java
index 90c95de3e1c..90c95de3e1c 100644
--- a/it/it-plugins/security-plugin/src/main/java/FakeUsersProvider.java
+++ b/tests/plugins/security-plugin/src/main/java/FakeUsersProvider.java
diff --git a/it/it-plugins/security-plugin/src/main/java/SecurityPlugin.java b/tests/plugins/security-plugin/src/main/java/SecurityPlugin.java
index c1cf7cd3b9e..c1cf7cd3b9e 100644
--- a/it/it-plugins/security-plugin/src/main/java/SecurityPlugin.java
+++ b/tests/plugins/security-plugin/src/main/java/SecurityPlugin.java
diff --git a/it/it-plugins/security-plugin/src/test/java/FakeAuthenticatorTest.java b/tests/plugins/security-plugin/src/test/java/FakeAuthenticatorTest.java
index e55aacb9478..e55aacb9478 100644
--- a/it/it-plugins/security-plugin/src/test/java/FakeAuthenticatorTest.java
+++ b/tests/plugins/security-plugin/src/test/java/FakeAuthenticatorTest.java
diff --git a/it/it-plugins/server-plugin/pom.xml b/tests/plugins/server-plugin/pom.xml
index 06e5fe8bb9f..5d436a95a67 100644
--- a/it/it-plugins/server-plugin/pom.xml
+++ b/tests/plugins/server-plugin/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/server-plugin/src/main/java/ServerPlugin.java b/tests/plugins/server-plugin/src/main/java/ServerPlugin.java
index 07aa1f861a2..07aa1f861a2 100644
--- a/it/it-plugins/server-plugin/src/main/java/ServerPlugin.java
+++ b/tests/plugins/server-plugin/src/main/java/ServerPlugin.java
diff --git a/it/it-plugins/server-plugin/src/main/java/StartupCrash.java b/tests/plugins/server-plugin/src/main/java/StartupCrash.java
index cf57ccbc653..cf57ccbc653 100644
--- a/it/it-plugins/server-plugin/src/main/java/StartupCrash.java
+++ b/tests/plugins/server-plugin/src/main/java/StartupCrash.java
diff --git a/it/it-plugins/server-plugin/src/main/java/TempFolderExtension.java b/tests/plugins/server-plugin/src/main/java/TempFolderExtension.java
index ddddf9d44de..ddddf9d44de 100644
--- a/it/it-plugins/server-plugin/src/main/java/TempFolderExtension.java
+++ b/tests/plugins/server-plugin/src/main/java/TempFolderExtension.java
diff --git a/it/it-plugins/settings-encryption-plugin/pom.xml b/tests/plugins/settings-encryption-plugin/pom.xml
index 3b51633ad9c..de124bc6ea3 100644
--- a/it/it-plugins/settings-encryption-plugin/pom.xml
+++ b/tests/plugins/settings-encryption-plugin/pom.xml
@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
   <artifactId>settings-encryption-plugin</artifactId>
diff --git a/it/it-plugins/settings-encryption-plugin/src/main/java/EncryptionVerifier.java b/tests/plugins/settings-encryption-plugin/src/main/java/EncryptionVerifier.java
index 64a5f686a9a..64a5f686a9a 100644
--- a/it/it-plugins/settings-encryption-plugin/src/main/java/EncryptionVerifier.java
+++ b/tests/plugins/settings-encryption-plugin/src/main/java/EncryptionVerifier.java
diff --git a/it/it-plugins/settings-encryption-plugin/src/main/java/SettingsEncryptionPlugin.java b/tests/plugins/settings-encryption-plugin/src/main/java/SettingsEncryptionPlugin.java
index f387aa353a1..f387aa353a1 100644
--- a/it/it-plugins/settings-encryption-plugin/src/main/java/SettingsEncryptionPlugin.java
+++ b/tests/plugins/settings-encryption-plugin/src/main/java/SettingsEncryptionPlugin.java
diff --git a/it/it-plugins/settings-plugin/pom.xml b/tests/plugins/settings-plugin/pom.xml
index fad8e9751f3..3712468e44f 100644
--- a/it/it-plugins/settings-plugin/pom.xml
+++ b/tests/plugins/settings-plugin/pom.xml
@@ -4,8 +4,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/settings-plugin/src/main/java/PropertyTypes.java b/tests/plugins/settings-plugin/src/main/java/PropertyTypes.java
index 6af745cf3a3..6af745cf3a3 100644
--- a/it/it-plugins/settings-plugin/src/main/java/PropertyTypes.java
+++ b/tests/plugins/settings-plugin/src/main/java/PropertyTypes.java
diff --git a/it/it-plugins/settings-plugin/src/main/java/ServerExtensionWithProperties.java b/tests/plugins/settings-plugin/src/main/java/ServerExtensionWithProperties.java
index c01936636a5..c01936636a5 100644
--- a/it/it-plugins/settings-plugin/src/main/java/ServerExtensionWithProperties.java
+++ b/tests/plugins/settings-plugin/src/main/java/ServerExtensionWithProperties.java
diff --git a/it/it-plugins/settings-plugin/src/main/java/SettingsPlugin.java b/tests/plugins/settings-plugin/src/main/java/SettingsPlugin.java
index 919c2960f2c..919c2960f2c 100644
--- a/it/it-plugins/settings-plugin/src/main/java/SettingsPlugin.java
+++ b/tests/plugins/settings-plugin/src/main/java/SettingsPlugin.java
diff --git a/it/it-plugins/sonar-fake-plugin/pom.xml b/tests/plugins/sonar-fake-plugin/pom.xml
index a7bbe6cf90b..3865b628fa5 100644
--- a/it/it-plugins/sonar-fake-plugin/pom.xml
+++ b/tests/plugins/sonar-fake-plugin/pom.xml
@@ -4,8 +4,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/sonar-fake-plugin/src/main/java/FakePlugin.java b/tests/plugins/sonar-fake-plugin/src/main/java/FakePlugin.java
index 9cb009a8f1e..9cb009a8f1e 100644
--- a/it/it-plugins/sonar-fake-plugin/src/main/java/FakePlugin.java
+++ b/tests/plugins/sonar-fake-plugin/src/main/java/FakePlugin.java
diff --git a/it/it-plugins/sonar-subcategories-plugin/pom.xml b/tests/plugins/sonar-subcategories-plugin/pom.xml
index 25423ce116b..b5c4d007667 100644
--- a/it/it-plugins/sonar-subcategories-plugin/pom.xml
+++ b/tests/plugins/sonar-subcategories-plugin/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/sonar-subcategories-plugin/src/main/java/SubCategoriesPlugin.java b/tests/plugins/sonar-subcategories-plugin/src/main/java/SubCategoriesPlugin.java
index 51681289401..51681289401 100644
--- a/it/it-plugins/sonar-subcategories-plugin/src/main/java/SubCategoriesPlugin.java
+++ b/tests/plugins/sonar-subcategories-plugin/src/main/java/SubCategoriesPlugin.java
diff --git a/it/it-plugins/sonar-subcategories-plugin/src/main/resources/org/sonar/l10n/subcategories.properties b/tests/plugins/sonar-subcategories-plugin/src/main/resources/org/sonar/l10n/subcategories.properties
index c5cba9d826c..c5cba9d826c 100644
--- a/it/it-plugins/sonar-subcategories-plugin/src/main/resources/org/sonar/l10n/subcategories.properties
+++ b/tests/plugins/sonar-subcategories-plugin/src/main/resources/org/sonar/l10n/subcategories.properties
diff --git a/it/it-plugins/ui-extensions-plugin/pom.xml b/tests/plugins/ui-extensions-plugin/pom.xml
index b6202b70b9d..8862aa011da 100644
--- a/it/it-plugins/ui-extensions-plugin/pom.xml
+++ b/tests/plugins/ui-extensions-plugin/pom.xml
@@ -3,8 +3,8 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/ui-extensions-plugin/src/main/java/UiExtensionsPlugin.java b/tests/plugins/ui-extensions-plugin/src/main/java/UiExtensionsPlugin.java
index 8c26c046b0b..8c26c046b0b 100644
--- a/it/it-plugins/ui-extensions-plugin/src/main/java/UiExtensionsPlugin.java
+++ b/tests/plugins/ui-extensions-plugin/src/main/java/UiExtensionsPlugin.java
diff --git a/it/it-plugins/ui-extensions-plugin/src/main/java/UiPageDefinition.java b/tests/plugins/ui-extensions-plugin/src/main/java/UiPageDefinition.java
index 6bcddd7c721..6bcddd7c721 100644
--- a/it/it-plugins/ui-extensions-plugin/src/main/java/UiPageDefinition.java
+++ b/tests/plugins/ui-extensions-plugin/src/main/java/UiPageDefinition.java
diff --git a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/cute.jpg b/tests/plugins/ui-extensions-plugin/src/main/resources/static/cute.jpg
index 20f59bc1c42..20f59bc1c42 100644
--- a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/cute.jpg
+++ b/tests/plugins/ui-extensions-plugin/src/main/resources/static/cute.jpg
diff --git a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/extension.js b/tests/plugins/ui-extensions-plugin/src/main/resources/static/extension.js
index fd35455a4ea..fd35455a4ea 100644
--- a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/extension.js
+++ b/tests/plugins/ui-extensions-plugin/src/main/resources/static/extension.js
diff --git a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/file.html b/tests/plugins/ui-extensions-plugin/src/main/resources/static/file.html
index 6b0300e5f19..6b0300e5f19 100644
--- a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/file.html
+++ b/tests/plugins/ui-extensions-plugin/src/main/resources/static/file.html
diff --git a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/global_admin_page.js b/tests/plugins/ui-extensions-plugin/src/main/resources/static/global_admin_page.js
index 18c70548fa8..18c70548fa8 100644
--- a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/global_admin_page.js
+++ b/tests/plugins/ui-extensions-plugin/src/main/resources/static/global_admin_page.js
diff --git a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/global_page.js b/tests/plugins/ui-extensions-plugin/src/main/resources/static/global_page.js
index b60b5588c03..b60b5588c03 100644
--- a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/global_page.js
+++ b/tests/plugins/ui-extensions-plugin/src/main/resources/static/global_page.js
diff --git a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/organization_admin_page.js b/tests/plugins/ui-extensions-plugin/src/main/resources/static/organization_admin_page.js
index a3f740d8823..a3f740d8823 100644
--- a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/organization_admin_page.js
+++ b/tests/plugins/ui-extensions-plugin/src/main/resources/static/organization_admin_page.js
diff --git a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/organization_page.js b/tests/plugins/ui-extensions-plugin/src/main/resources/static/organization_page.js
index 50c7e242f12..50c7e242f12 100644
--- a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/organization_page.js
+++ b/tests/plugins/ui-extensions-plugin/src/main/resources/static/organization_page.js
diff --git a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/project_admin_page.js b/tests/plugins/ui-extensions-plugin/src/main/resources/static/project_admin_page.js
index bc632ea0a85..bc632ea0a85 100644
--- a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/project_admin_page.js
+++ b/tests/plugins/ui-extensions-plugin/src/main/resources/static/project_admin_page.js
diff --git a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/project_page.js b/tests/plugins/ui-extensions-plugin/src/main/resources/static/project_page.js
index 1e28dace449..1e28dace449 100644
--- a/it/it-plugins/ui-extensions-plugin/src/main/resources/static/project_page.js
+++ b/tests/plugins/ui-extensions-plugin/src/main/resources/static/project_page.js
diff --git a/it/it-plugins/ws-plugin/pom.xml b/tests/plugins/ws-plugin/pom.xml
index ba9f46755a5..ff9df700886 100644
--- a/it/it-plugins/ws-plugin/pom.xml
+++ b/tests/plugins/ws-plugin/pom.xml
@@ -3,8 +3,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it-plugins</artifactId>
+    <groupId>org.sonarsource.sonarqube.tests</groupId>
+    <artifactId>plugins</artifactId>
     <version>6.5-SNAPSHOT</version>
   </parent>
 
diff --git a/it/it-plugins/ws-plugin/src/main/java/LocalCallWebService.java b/tests/plugins/ws-plugin/src/main/java/LocalCallWebService.java
index 7de752bba25..7de752bba25 100644
--- a/it/it-plugins/ws-plugin/src/main/java/LocalCallWebService.java
+++ b/tests/plugins/ws-plugin/src/main/java/LocalCallWebService.java
diff --git a/it/it-plugins/ws-plugin/src/main/java/WsPlugin.java b/tests/plugins/ws-plugin/src/main/java/WsPlugin.java
index e36a8551d0e..e36a8551d0e 100644
--- a/it/it-plugins/ws-plugin/src/main/java/WsPlugin.java
+++ b/tests/plugins/ws-plugin/src/main/java/WsPlugin.java
diff --git a/tests/pom.xml b/tests/pom.xml
index dc079ee0b75..2409cdfda33 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -10,24 +10,174 @@
     <version>6.5-SNAPSHOT</version>
   </parent>
 
+  <groupId>org.sonarsource.sonarqube.tests</groupId>
   <artifactId>tests</artifactId>
-  <name>SonarQube Perf and Upgrade Tests</name>
-  <packaging>pom</packaging>
+  <name>SonarQube Integration Tests</name>
+  <description>Integration, performance, upgrade tests</description>
 
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
     <source.skip>true</source.skip>
     <enforcer.skip>true</enforcer.skip>
+    <skipSanityChecks>true</skipSanityChecks>
     <sqZipDir>../sonar-application/target</sqZipDir>
+    <category>*</category>
+    <skipIts>false</skipIts>
+    <jetty.version>9.3.11.v20160721</jetty.version>
   </properties>
 
-  <modules>
-    <module>perf</module>
-    <module>upgrade</module>
-  </modules>
+  <dependencies>
+    <!-- must be declared first -->
+    <dependency>
+      <groupId>org.sonarsource.orchestrator</groupId>
+      <artifactId>sonar-orchestrator</artifactId>
+      <version>${orchestrator.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.sonarsource.sonarqube</groupId>
+      <artifactId>sonar-application</artifactId>
+      <version>${project.parent.version}</version>
+      <type>zip</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.sonarsource.sonarqube</groupId>
+      <artifactId>sonar-ws</artifactId>
+      <version>${project.parent.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.codeborne</groupId>
+      <artifactId>selenide</artifactId>
+      <version>4.4.3</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <!-- required for selenide -->
+      <version>21.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.sonar</groupId>
+      <artifactId>sonar-ws-client</artifactId>
+      <version>5.0</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-all</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.googlecode.json-simple</groupId>
+      <artifactId>json-simple</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.skyscreamer</groupId>
+      <artifactId>jsonassert</artifactId>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jsoup</groupId>
+      <artifactId>jsoup</artifactId>
+      <version>1.8.3</version>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>mockwebserver</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-email</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.subethamail</groupId>
+      <artifactId>subethasmtp</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-proxy</artifactId>
+      <version>${jetty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.sonarsource.scanner.cli</groupId>
+      <artifactId>sonar-scanner-cli</artifactId>
+      <version>2.7</version>
+      <type>zip</type>
+    </dependency>
+
+    <!-- JDBC drivers -->
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.microsoft.sqlserver</groupId>
+      <artifactId>mssql-jdbc</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>-Dsonar.runtimeVersion=${project.version}
+            -Dmaven.localRepository=${settings.localRepository}
+          </argLine>
+          <skipTests>${skipIts}</skipTests>
+          <includes>
+            <include>*/*${category}Suite.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
   <profiles>
     <profile>
+      <!-- TODO rename to oracle -->
+      <id>with-db-drivers</id>
+      <activation>
+        <property>
+          <name>with-db-drivers</name>
+        </property>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>com.oracle</groupId>
+          <artifactId>ojdbc6</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
       <id>qa</id>
       <activation>
         <property>
@@ -50,14 +200,35 @@
                 <configuration>
                   <artifactItems>
                     <artifactItem>
-                      <groupId>${project.groupId}</groupId>
+                      <groupId>org.sonarsource.sonarqube</groupId>
                       <artifactId>sonar-application</artifactId>
                       <version>${project.version}</version>
                       <type>zip</type>
                       <overWrite>true</overWrite>
                     </artifactItem>
                   </artifactItems>
-                  <outputDirectory>${sqZipDir}</outputDirectory>
+                  <outputDirectory>${project.basedir}/../sonar-application/target</outputDirectory>
+                  <overWriteReleases>true</overWriteReleases>
+                  <overWriteSnapshots>true</overWriteSnapshots>
+                </configuration>
+              </execution>
+              <execution>
+                <id>copy-xoo-plugin</id>
+                <phase>generate-test-resources</phase>
+                <goals>
+                  <goal>copy</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.sonarsource.sonarqube</groupId>
+                      <artifactId>sonar-xoo-plugin</artifactId>
+                      <version>${project.version}</version>
+                      <type>sonar-plugin</type>
+                      <overWrite>true</overWrite>
+                    </artifactItem>
+                  </artifactItems>
+                  <outputDirectory>${project.basedir}/../plugins/sonar-xoo-plugin/target</outputDirectory>
                   <overWriteReleases>true</overWriteReleases>
                   <overWriteSnapshots>true</overWriteSnapshots>
                 </configuration>
diff --git a/it/it-projects/analysis/case-sensitive-file-extensions/sonar-project.properties b/tests/projects/analysis/case-sensitive-file-extensions/sonar-project.properties
index 795bbeb5cf9..795bbeb5cf9 100644
--- a/it/it-projects/analysis/case-sensitive-file-extensions/sonar-project.properties
+++ b/tests/projects/analysis/case-sensitive-file-extensions/sonar-project.properties
diff --git a/it/it-projects/analysis/case-sensitive-file-extensions/src/UPPER.XOO b/tests/projects/analysis/case-sensitive-file-extensions/src/UPPER.XOO
index 7a7569a867b..7a7569a867b 100644
--- a/it/it-projects/analysis/case-sensitive-file-extensions/src/UPPER.XOO
+++ b/tests/projects/analysis/case-sensitive-file-extensions/src/UPPER.XOO
diff --git a/it/it-projects/analysis/case-sensitive-file-extensions/src/UPPER.XOO.measures b/tests/projects/analysis/case-sensitive-file-extensions/src/UPPER.XOO.measures
index 5143bc664f8..5143bc664f8 100644
--- a/it/it-projects/analysis/case-sensitive-file-extensions/src/UPPER.XOO.measures
+++ b/tests/projects/analysis/case-sensitive-file-extensions/src/UPPER.XOO.measures
diff --git a/it/it-projects/analysis/case-sensitive-file-extensions/src/lower.xoo b/tests/projects/analysis/case-sensitive-file-extensions/src/lower.xoo
index fd97999fff8..fd97999fff8 100644
--- a/it/it-projects/analysis/case-sensitive-file-extensions/src/lower.xoo
+++ b/tests/projects/analysis/case-sensitive-file-extensions/src/lower.xoo
diff --git a/it/it-projects/analysis/case-sensitive-file-extensions/src/lower.xoo.measures b/tests/projects/analysis/case-sensitive-file-extensions/src/lower.xoo.measures
index f82c5911efa..f82c5911efa 100644
--- a/it/it-projects/analysis/case-sensitive-file-extensions/src/lower.xoo.measures
+++ b/tests/projects/analysis/case-sensitive-file-extensions/src/lower.xoo.measures
diff --git a/it/it-projects/analysis/custom-module-key/module_a/sonar-project.properties b/tests/projects/analysis/custom-module-key/module_a/sonar-project.properties
index 7c95bd81729..7c95bd81729 100644
--- a/it/it-projects/analysis/custom-module-key/module_a/sonar-project.properties
+++ b/tests/projects/analysis/custom-module-key/module_a/sonar-project.properties
diff --git a/it/it-projects/analysis/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/tests/projects/analysis/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/it/it-projects/analysis/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/tests/projects/analysis/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/it/it-projects/analysis/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/tests/projects/analysis/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/analysis/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
+++ b/tests/projects/analysis/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
diff --git a/it/it-projects/analysis/custom-module-key/module_b/sonar-project.properties b/tests/projects/analysis/custom-module-key/module_b/sonar-project.properties
index 04cd79e2247..04cd79e2247 100644
--- a/it/it-projects/analysis/custom-module-key/module_b/sonar-project.properties
+++ b/tests/projects/analysis/custom-module-key/module_b/sonar-project.properties
diff --git a/it/it-projects/analysis/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/tests/projects/analysis/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 42039538a92..42039538a92 100644
--- a/it/it-projects/analysis/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/tests/projects/analysis/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/analysis/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/tests/projects/analysis/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/analysis/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/tests/projects/analysis/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/analysis/custom-module-key/sonar-project.properties b/tests/projects/analysis/custom-module-key/sonar-project.properties
index 7935cb5ffb0..7935cb5ffb0 100644
--- a/it/it-projects/analysis/custom-module-key/sonar-project.properties
+++ b/tests/projects/analysis/custom-module-key/sonar-project.properties
diff --git a/it/it-projects/analysis/duplicate-source/sonar-project.properties b/tests/projects/analysis/duplicate-source/sonar-project.properties
index cf176850bae..cf176850bae 100644
--- a/it/it-projects/analysis/duplicate-source/sonar-project.properties
+++ b/tests/projects/analysis/duplicate-source/sonar-project.properties
diff --git a/it/it-projects/analysis/duplicate-source/src/main/xoo/org/sonar/tests/ClassOne.xoo b/tests/projects/analysis/duplicate-source/src/main/xoo/org/sonar/tests/ClassOne.xoo
index 8cf8aec82fe..8cf8aec82fe 100644
--- a/it/it-projects/analysis/duplicate-source/src/main/xoo/org/sonar/tests/ClassOne.xoo
+++ b/tests/projects/analysis/duplicate-source/src/main/xoo/org/sonar/tests/ClassOne.xoo
diff --git a/it/it-projects/analysis/duplicate-source/src/main/xoo2/org/sonar/tests/ClassOne.xoo b/tests/projects/analysis/duplicate-source/src/main/xoo2/org/sonar/tests/ClassOne.xoo
index 8cf8aec82fe..8cf8aec82fe 100644
--- a/it/it-projects/analysis/duplicate-source/src/main/xoo2/org/sonar/tests/ClassOne.xoo
+++ b/tests/projects/analysis/duplicate-source/src/main/xoo2/org/sonar/tests/ClassOne.xoo
diff --git a/it/it-projects/analysis/duplicate-source/src/test/xoo/org/sonar/tests/ClassOne.xoo b/tests/projects/analysis/duplicate-source/src/test/xoo/org/sonar/tests/ClassOne.xoo
index 8cf8aec82fe..8cf8aec82fe 100644
--- a/it/it-projects/analysis/duplicate-source/src/test/xoo/org/sonar/tests/ClassOne.xoo
+++ b/tests/projects/analysis/duplicate-source/src/test/xoo/org/sonar/tests/ClassOne.xoo
diff --git a/it/it-projects/analysis/extension-lifecycle/module_a/pom.xml b/tests/projects/analysis/extension-lifecycle/module_a/pom.xml
index 8cc056c4e81..8cc056c4e81 100644
--- a/it/it-projects/analysis/extension-lifecycle/module_a/pom.xml
+++ b/tests/projects/analysis/extension-lifecycle/module_a/pom.xml
diff --git a/it/it-projects/analysis/extension-lifecycle/module_a/src/main/java/HelloA.java b/tests/projects/analysis/extension-lifecycle/module_a/src/main/java/HelloA.java
index 847098b9a50..847098b9a50 100644
--- a/it/it-projects/analysis/extension-lifecycle/module_a/src/main/java/HelloA.java
+++ b/tests/projects/analysis/extension-lifecycle/module_a/src/main/java/HelloA.java
diff --git a/it/it-projects/analysis/extension-lifecycle/module_b/pom.xml b/tests/projects/analysis/extension-lifecycle/module_b/pom.xml
index 449325b7691..449325b7691 100644
--- a/it/it-projects/analysis/extension-lifecycle/module_b/pom.xml
+++ b/tests/projects/analysis/extension-lifecycle/module_b/pom.xml
diff --git a/it/it-projects/analysis/extension-lifecycle/module_b/src/main/java/HelloB.java b/tests/projects/analysis/extension-lifecycle/module_b/src/main/java/HelloB.java
index afc7d2c906c..afc7d2c906c 100644
--- a/it/it-projects/analysis/extension-lifecycle/module_b/src/main/java/HelloB.java
+++ b/tests/projects/analysis/extension-lifecycle/module_b/src/main/java/HelloB.java
diff --git a/it/it-projects/analysis/extension-lifecycle/pom.xml b/tests/projects/analysis/extension-lifecycle/pom.xml
index 30de64cef8c..30de64cef8c 100644
--- a/it/it-projects/analysis/extension-lifecycle/pom.xml
+++ b/tests/projects/analysis/extension-lifecycle/pom.xml
diff --git a/it/it-projects/analysis/links-project/pom.xml b/tests/projects/analysis/links-project/pom.xml
index a0bc27aaab6..a0bc27aaab6 100644
--- a/it/it-projects/analysis/links-project/pom.xml
+++ b/tests/projects/analysis/links-project/pom.xml
diff --git a/it/it-projects/analysis/links-project/sonar-project.properties b/tests/projects/analysis/links-project/sonar-project.properties
index 4352408bd5c..4352408bd5c 100644
--- a/it/it-projects/analysis/links-project/sonar-project.properties
+++ b/tests/projects/analysis/links-project/sonar-project.properties
diff --git a/it/it-projects/analysis/links-project/src/main/java/sample/Sample.java b/tests/projects/analysis/links-project/src/main/java/sample/Sample.java
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/analysis/links-project/src/main/java/sample/Sample.java
+++ b/tests/projects/analysis/links-project/src/main/java/sample/Sample.java
diff --git a/it/it-projects/analysis/multi-languages/java-module/pom.xml b/tests/projects/analysis/multi-languages/java-module/pom.xml
index 9b9cb11763f..9b9cb11763f 100644
--- a/it/it-projects/analysis/multi-languages/java-module/pom.xml
+++ b/tests/projects/analysis/multi-languages/java-module/pom.xml
diff --git a/it/it-projects/analysis/multi-languages/java-module/src/main/java/HelloJava.java b/tests/projects/analysis/multi-languages/java-module/src/main/java/HelloJava.java
index c575aeb9d4c..c575aeb9d4c 100644
--- a/it/it-projects/analysis/multi-languages/java-module/src/main/java/HelloJava.java
+++ b/tests/projects/analysis/multi-languages/java-module/src/main/java/HelloJava.java
diff --git a/it/it-projects/analysis/multi-languages/javascript-module/pom.xml b/tests/projects/analysis/multi-languages/javascript-module/pom.xml
index f0eb641e9e2..f0eb641e9e2 100644
--- a/it/it-projects/analysis/multi-languages/javascript-module/pom.xml
+++ b/tests/projects/analysis/multi-languages/javascript-module/pom.xml
diff --git a/it/it-projects/analysis/multi-languages/javascript-module/src/Person.js b/tests/projects/analysis/multi-languages/javascript-module/src/Person.js
index d5eb180de72..d5eb180de72 100644
--- a/it/it-projects/analysis/multi-languages/javascript-module/src/Person.js
+++ b/tests/projects/analysis/multi-languages/javascript-module/src/Person.js
diff --git a/it/it-projects/analysis/multi-languages/pom.xml b/tests/projects/analysis/multi-languages/pom.xml
index bdde8327393..bdde8327393 100644
--- a/it/it-projects/analysis/multi-languages/pom.xml
+++ b/tests/projects/analysis/multi-languages/pom.xml
diff --git a/it/it-projects/analysis/multi-languages/python-module/pom.xml b/tests/projects/analysis/multi-languages/python-module/pom.xml
index 02520cd6de9..02520cd6de9 100644
--- a/it/it-projects/analysis/multi-languages/python-module/pom.xml
+++ b/tests/projects/analysis/multi-languages/python-module/pom.xml
diff --git a/it/it-projects/analysis/multi-languages/python-module/src/__init__.py b/tests/projects/analysis/multi-languages/python-module/src/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/it/it-projects/analysis/multi-languages/python-module/src/__init__.py
+++ b/tests/projects/analysis/multi-languages/python-module/src/__init__.py
diff --git a/it/it-projects/analysis/multi-languages/python-module/src/badfortune.py b/tests/projects/analysis/multi-languages/python-module/src/badfortune.py
index b0900dc1695..b0900dc1695 100644
--- a/it/it-projects/analysis/multi-languages/python-module/src/badfortune.py
+++ b/tests/projects/analysis/multi-languages/python-module/src/badfortune.py
diff --git a/it/it-projects/analysis/multi-languages/sonar-project.properties b/tests/projects/analysis/multi-languages/sonar-project.properties
index ab848fa49f4..ab848fa49f4 100644
--- a/it/it-projects/analysis/multi-languages/sonar-project.properties
+++ b/tests/projects/analysis/multi-languages/sonar-project.properties
diff --git a/it/it-projects/analysis/prevent-common-module/projectAB/module_a/sonar-project.properties b/tests/projects/analysis/prevent-common-module/projectAB/module_a/sonar-project.properties
index 7c95bd81729..7c95bd81729 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAB/module_a/sonar-project.properties
+++ b/tests/projects/analysis/prevent-common-module/projectAB/module_a/sonar-project.properties
diff --git a/it/it-projects/analysis/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/tests/projects/analysis/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/tests/projects/analysis/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/it/it-projects/analysis/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/tests/projects/analysis/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
+++ b/tests/projects/analysis/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
diff --git a/it/it-projects/analysis/prevent-common-module/projectAB/module_b/sonar-project.properties b/tests/projects/analysis/prevent-common-module/projectAB/module_b/sonar-project.properties
index 04cd79e2247..04cd79e2247 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAB/module_b/sonar-project.properties
+++ b/tests/projects/analysis/prevent-common-module/projectAB/module_b/sonar-project.properties
diff --git a/it/it-projects/analysis/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/tests/projects/analysis/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 42039538a92..42039538a92 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/tests/projects/analysis/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/analysis/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/tests/projects/analysis/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/tests/projects/analysis/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/analysis/prevent-common-module/projectAB/sonar-project.properties b/tests/projects/analysis/prevent-common-module/projectAB/sonar-project.properties
index e3c23037ee1..e3c23037ee1 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAB/sonar-project.properties
+++ b/tests/projects/analysis/prevent-common-module/projectAB/sonar-project.properties
diff --git a/it/it-projects/analysis/prevent-common-module/projectAC/module_a/sonar-project.properties b/tests/projects/analysis/prevent-common-module/projectAC/module_a/sonar-project.properties
index 7c95bd81729..7c95bd81729 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAC/module_a/sonar-project.properties
+++ b/tests/projects/analysis/prevent-common-module/projectAC/module_a/sonar-project.properties
diff --git a/it/it-projects/analysis/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/tests/projects/analysis/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/tests/projects/analysis/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/it/it-projects/analysis/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/tests/projects/analysis/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
+++ b/tests/projects/analysis/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
diff --git a/it/it-projects/analysis/prevent-common-module/projectAC/module_c/sonar-project.properties b/tests/projects/analysis/prevent-common-module/projectAC/module_c/sonar-project.properties
index 670f26db1db..670f26db1db 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAC/module_c/sonar-project.properties
+++ b/tests/projects/analysis/prevent-common-module/projectAC/module_c/sonar-project.properties
diff --git a/it/it-projects/analysis/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/tests/projects/analysis/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 42039538a92..42039538a92 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/tests/projects/analysis/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/analysis/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/tests/projects/analysis/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/tests/projects/analysis/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/analysis/prevent-common-module/projectAC/sonar-project.properties b/tests/projects/analysis/prevent-common-module/projectAC/sonar-project.properties
index 342fb68ec8f..342fb68ec8f 100644
--- a/it/it-projects/analysis/prevent-common-module/projectAC/sonar-project.properties
+++ b/tests/projects/analysis/prevent-common-module/projectAC/sonar-project.properties
diff --git a/it/it-projects/analysis/project-builder/module_a/src/HelloA.java b/tests/projects/analysis/project-builder/module_a/src/HelloA.java
index 847098b9a50..847098b9a50 100644
--- a/it/it-projects/analysis/project-builder/module_a/src/HelloA.java
+++ b/tests/projects/analysis/project-builder/module_a/src/HelloA.java
diff --git a/it/it-projects/analysis/project-builder/module_b/src/HelloB.java b/tests/projects/analysis/project-builder/module_b/src/HelloB.java
index afc7d2c906c..afc7d2c906c 100644
--- a/it/it-projects/analysis/project-builder/module_b/src/HelloB.java
+++ b/tests/projects/analysis/project-builder/module_b/src/HelloB.java
diff --git a/it/it-projects/analysis/project-builder/module_b/src/IgnoredFile.java b/tests/projects/analysis/project-builder/module_b/src/IgnoredFile.java
index 9574c15b0ee..9574c15b0ee 100644
--- a/it/it-projects/analysis/project-builder/module_b/src/IgnoredFile.java
+++ b/tests/projects/analysis/project-builder/module_b/src/IgnoredFile.java
diff --git a/it/it-projects/analysis/project-builder/pom.xml b/tests/projects/analysis/project-builder/pom.xml
index e79f785f013..e79f785f013 100644
--- a/it/it-projects/analysis/project-builder/pom.xml
+++ b/tests/projects/analysis/project-builder/pom.xml
diff --git a/it/it-projects/analysis/tracking/v1/sonar-project.properties b/tests/projects/analysis/tracking/v1/sonar-project.properties
index e01f062e51b..e01f062e51b 100644
--- a/it/it-projects/analysis/tracking/v1/sonar-project.properties
+++ b/tests/projects/analysis/tracking/v1/sonar-project.properties
diff --git a/it/it-projects/analysis/tracking/v1/src/main/xoo/sample/Sample.xoo b/tests/projects/analysis/tracking/v1/src/main/xoo/sample/Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/analysis/tracking/v1/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/analysis/tracking/v1/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/analysis/tracking/v1/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/analysis/tracking/v1/src/main/xoo/sample/Sample.xoo.measures
index 7bb5f438500..7bb5f438500 100644
--- a/it/it-projects/analysis/tracking/v1/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/analysis/tracking/v1/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/analysis/tracking/v2/sonar-project.properties b/tests/projects/analysis/tracking/v2/sonar-project.properties
index e01f062e51b..e01f062e51b 100644
--- a/it/it-projects/analysis/tracking/v2/sonar-project.properties
+++ b/tests/projects/analysis/tracking/v2/sonar-project.properties
diff --git a/it/it-projects/analysis/tracking/v2/src/main/xoo/sample/Sample.xoo b/tests/projects/analysis/tracking/v2/src/main/xoo/sample/Sample.xoo
index 3f624a15b08..3f624a15b08 100644
--- a/it/it-projects/analysis/tracking/v2/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/analysis/tracking/v2/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/analysis/tracking/v2/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/analysis/tracking/v2/src/main/xoo/sample/Sample.xoo.measures
index 69a10eb19d4..69a10eb19d4 100644
--- a/it/it-projects/analysis/tracking/v2/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/analysis/tracking/v2/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/analysis/xoo-history-v2/sonar-project.properties b/tests/projects/analysis/xoo-history-v2/sonar-project.properties
index e01f062e51b..e01f062e51b 100644
--- a/it/it-projects/analysis/xoo-history-v2/sonar-project.properties
+++ b/tests/projects/analysis/xoo-history-v2/sonar-project.properties
diff --git a/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo b/tests/projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
index b0fd1087030..b0fd1087030 100644
--- a/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
+++ b/tests/projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
diff --git a/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures b/tests/projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
index 66ba834e1ef..66ba834e1ef 100644
--- a/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
+++ b/tests/projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
diff --git a/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo b/tests/projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
index 393111bbab0..393111bbab0 100644
--- a/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
+++ b/tests/projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
diff --git a/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures b/tests/projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
index 71d60758637..71d60758637 100644
--- a/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
+++ b/tests/projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
diff --git a/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo b/tests/projects/analysis/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
index 2b0288fc971..2b0288fc971 100644
--- a/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
+++ b/tests/projects/analysis/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
diff --git a/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures b/tests/projects/analysis/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
+++ b/tests/projects/analysis/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
diff --git a/it/it-projects/analysis/xoo-multi-languages/sonar-project.properties b/tests/projects/analysis/xoo-multi-languages/sonar-project.properties
index a2941788c41..a2941788c41 100644
--- a/it/it-projects/analysis/xoo-multi-languages/sonar-project.properties
+++ b/tests/projects/analysis/xoo-multi-languages/sonar-project.properties
diff --git a/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo b/tests/projects/analysis/xoo-multi-languages/src/sample/Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo
+++ b/tests/projects/analysis/xoo-multi-languages/src/sample/Sample.xoo
diff --git a/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo.measures b/tests/projects/analysis/xoo-multi-languages/src/sample/Sample.xoo.measures
index 5dc0154b75d..5dc0154b75d 100644
--- a/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo.measures
+++ b/tests/projects/analysis/xoo-multi-languages/src/sample/Sample.xoo.measures
diff --git a/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo2 b/tests/projects/analysis/xoo-multi-languages/src/sample/Sample.xoo2
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo2
+++ b/tests/projects/analysis/xoo-multi-languages/src/sample/Sample.xoo2
diff --git a/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo2.measures b/tests/projects/analysis/xoo-multi-languages/src/sample/Sample.xoo2.measures
index 5dc0154b75d..5dc0154b75d 100644
--- a/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo2.measures
+++ b/tests/projects/analysis/xoo-multi-languages/src/sample/Sample.xoo2.measures
diff --git a/it/it-projects/analysis/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo b/tests/projects/analysis/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/analysis/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo
+++ b/tests/projects/analysis/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo
diff --git a/it/it-projects/analysis/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo.measures b/tests/projects/analysis/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo.measures
index 641332a5013..641332a5013 100644
--- a/it/it-projects/analysis/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo.measures
+++ b/tests/projects/analysis/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo.measures
diff --git a/it/it-projects/analysis/xoo-sample-with-spaces/v1/sonar-project.properties b/tests/projects/analysis/xoo-sample-with-spaces/v1/sonar-project.properties
index bae5f7f152c..bae5f7f152c 100644
--- a/it/it-projects/analysis/xoo-sample-with-spaces/v1/sonar-project.properties
+++ b/tests/projects/analysis/xoo-sample-with-spaces/v1/sonar-project.properties
diff --git a/it/it-projects/analysis/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo b/tests/projects/analysis/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo
index 8c91df8b6cf..8c91df8b6cf 100644
--- a/it/it-projects/analysis/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo
+++ b/tests/projects/analysis/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo
diff --git a/it/it-projects/analysis/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo.measures b/tests/projects/analysis/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo.measures
index 641332a5013..641332a5013 100644
--- a/it/it-projects/analysis/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo.measures
+++ b/tests/projects/analysis/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo.measures
diff --git a/it/it-projects/analysis/xoo-sample-with-spaces/v2/sonar-project.properties b/tests/projects/analysis/xoo-sample-with-spaces/v2/sonar-project.properties
index bae5f7f152c..bae5f7f152c 100644
--- a/it/it-projects/analysis/xoo-sample-with-spaces/v2/sonar-project.properties
+++ b/tests/projects/analysis/xoo-sample-with-spaces/v2/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/after/module_a/module_a1/sonar-project.properties b/tests/projects/dbCleaner/files/after/module_a/module_a1/sonar-project.properties
index a081a0e6342..a081a0e6342 100644
--- a/it/it-projects/dbCleaner/files/after/module_a/module_a1/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/after/module_a/module_a1/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/NewHelloA1.xoo b/tests/projects/dbCleaner/files/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/NewHelloA1.xoo
index f21f75685b5..f21f75685b5 100644
--- a/it/it-projects/dbCleaner/files/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/NewHelloA1.xoo
+++ b/tests/projects/dbCleaner/files/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/NewHelloA1.xoo
diff --git a/it/it-projects/dbCleaner/files/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/NewHelloA1.xoo.measures b/tests/projects/dbCleaner/files/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/NewHelloA1.xoo.measures
index 737b14c6713..737b14c6713 100644
--- a/it/it-projects/dbCleaner/files/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/NewHelloA1.xoo.measures
+++ b/tests/projects/dbCleaner/files/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/NewHelloA1.xoo.measures
diff --git a/it/it-projects/dbCleaner/files/after/module_a/module_a2/sonar-project.properties b/tests/projects/dbCleaner/files/after/module_a/module_a2/sonar-project.properties
index fcedab83843..fcedab83843 100644
--- a/it/it-projects/dbCleaner/files/after/module_a/module_a2/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/after/module_a/module_a2/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/tests/projects/dbCleaner/files/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 42039538a92..42039538a92 100644
--- a/it/it-projects/dbCleaner/files/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/tests/projects/dbCleaner/files/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/dbCleaner/files/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/tests/projects/dbCleaner/files/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/files/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/tests/projects/dbCleaner/files/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/dbCleaner/files/after/module_a/sonar-project.properties b/tests/projects/dbCleaner/files/after/module_a/sonar-project.properties
index 7e6ca9074a4..7e6ca9074a4 100644
--- a/it/it-projects/dbCleaner/files/after/module_a/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/after/module_a/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/after/module_b/module_b1/sonar-project.properties b/tests/projects/dbCleaner/files/after/module_b/module_b1/sonar-project.properties
index ca8404b7bd4..ca8404b7bd4 100644
--- a/it/it-projects/dbCleaner/files/after/module_b/module_b1/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/after/module_b/module_b1/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/after/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo b/tests/projects/dbCleaner/files/after/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
index b83c3af128c..b83c3af128c 100644
--- a/it/it-projects/dbCleaner/files/after/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
+++ b/tests/projects/dbCleaner/files/after/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
diff --git a/it/it-projects/dbCleaner/files/after/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures b/tests/projects/dbCleaner/files/after/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/files/after/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
+++ b/tests/projects/dbCleaner/files/after/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
diff --git a/it/it-projects/dbCleaner/files/after/module_b/module_b2/sonar-project.properties b/tests/projects/dbCleaner/files/after/module_b/module_b2/sonar-project.properties
index e597dab4f33..e597dab4f33 100644
--- a/it/it-projects/dbCleaner/files/after/module_b/module_b2/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/after/module_b/module_b2/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/after/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo b/tests/projects/dbCleaner/files/after/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
index 20b8bb3876a..20b8bb3876a 100644
--- a/it/it-projects/dbCleaner/files/after/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
+++ b/tests/projects/dbCleaner/files/after/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
diff --git a/it/it-projects/dbCleaner/files/after/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures b/tests/projects/dbCleaner/files/after/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/files/after/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
+++ b/tests/projects/dbCleaner/files/after/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
diff --git a/it/it-projects/dbCleaner/files/after/module_b/sonar-project.properties b/tests/projects/dbCleaner/files/after/module_b/sonar-project.properties
index 21d69f769d3..21d69f769d3 100644
--- a/it/it-projects/dbCleaner/files/after/module_b/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/after/module_b/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/after/sonar-project.properties b/tests/projects/dbCleaner/files/after/sonar-project.properties
index 7935cb5ffb0..7935cb5ffb0 100644
--- a/it/it-projects/dbCleaner/files/after/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/after/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/before/module_a/module_a1/sonar-project.properties b/tests/projects/dbCleaner/files/before/module_a/module_a1/sonar-project.properties
index a081a0e6342..a081a0e6342 100644
--- a/it/it-projects/dbCleaner/files/before/module_a/module_a1/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/before/module_a/module_a1/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/tests/projects/dbCleaner/files/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/it/it-projects/dbCleaner/files/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/tests/projects/dbCleaner/files/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/it/it-projects/dbCleaner/files/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/tests/projects/dbCleaner/files/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
index 737b14c6713..737b14c6713 100644
--- a/it/it-projects/dbCleaner/files/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
+++ b/tests/projects/dbCleaner/files/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
diff --git a/it/it-projects/dbCleaner/files/before/module_a/module_a2/sonar-project.properties b/tests/projects/dbCleaner/files/before/module_a/module_a2/sonar-project.properties
index fcedab83843..fcedab83843 100644
--- a/it/it-projects/dbCleaner/files/before/module_a/module_a2/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/before/module_a/module_a2/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/tests/projects/dbCleaner/files/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 42039538a92..42039538a92 100644
--- a/it/it-projects/dbCleaner/files/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/tests/projects/dbCleaner/files/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/dbCleaner/files/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/tests/projects/dbCleaner/files/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/files/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/tests/projects/dbCleaner/files/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/dbCleaner/files/before/module_a/sonar-project.properties b/tests/projects/dbCleaner/files/before/module_a/sonar-project.properties
index 7e6ca9074a4..7e6ca9074a4 100644
--- a/it/it-projects/dbCleaner/files/before/module_a/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/before/module_a/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/before/module_b/module_b1/sonar-project.properties b/tests/projects/dbCleaner/files/before/module_b/module_b1/sonar-project.properties
index ca8404b7bd4..ca8404b7bd4 100644
--- a/it/it-projects/dbCleaner/files/before/module_b/module_b1/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/before/module_b/module_b1/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo b/tests/projects/dbCleaner/files/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
index b83c3af128c..b83c3af128c 100644
--- a/it/it-projects/dbCleaner/files/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
+++ b/tests/projects/dbCleaner/files/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
diff --git a/it/it-projects/dbCleaner/files/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures b/tests/projects/dbCleaner/files/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/files/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
+++ b/tests/projects/dbCleaner/files/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
diff --git a/it/it-projects/dbCleaner/files/before/module_b/module_b2/sonar-project.properties b/tests/projects/dbCleaner/files/before/module_b/module_b2/sonar-project.properties
index e597dab4f33..e597dab4f33 100644
--- a/it/it-projects/dbCleaner/files/before/module_b/module_b2/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/before/module_b/module_b2/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo b/tests/projects/dbCleaner/files/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
index 20b8bb3876a..20b8bb3876a 100644
--- a/it/it-projects/dbCleaner/files/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
+++ b/tests/projects/dbCleaner/files/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
diff --git a/it/it-projects/dbCleaner/files/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures b/tests/projects/dbCleaner/files/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/files/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
+++ b/tests/projects/dbCleaner/files/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
diff --git a/it/it-projects/dbCleaner/files/before/module_b/sonar-project.properties b/tests/projects/dbCleaner/files/before/module_b/sonar-project.properties
index 21d69f769d3..21d69f769d3 100644
--- a/it/it-projects/dbCleaner/files/before/module_b/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/before/module_b/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/files/before/sonar-project.properties b/tests/projects/dbCleaner/files/before/sonar-project.properties
index 7935cb5ffb0..7935cb5ffb0 100644
--- a/it/it-projects/dbCleaner/files/before/sonar-project.properties
+++ b/tests/projects/dbCleaner/files/before/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/after/module_a/module_a1/sonar-project.properties b/tests/projects/dbCleaner/modules/after/module_a/module_a1/sonar-project.properties
index a081a0e6342..a081a0e6342 100644
--- a/it/it-projects/dbCleaner/modules/after/module_a/module_a1/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/after/module_a/module_a1/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/tests/projects/dbCleaner/modules/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/it/it-projects/dbCleaner/modules/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/tests/projects/dbCleaner/modules/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/it/it-projects/dbCleaner/modules/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/tests/projects/dbCleaner/modules/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
index 737b14c6713..737b14c6713 100644
--- a/it/it-projects/dbCleaner/modules/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
+++ b/tests/projects/dbCleaner/modules/after/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
diff --git a/it/it-projects/dbCleaner/modules/after/module_a/module_a2/sonar-project.properties b/tests/projects/dbCleaner/modules/after/module_a/module_a2/sonar-project.properties
index fcedab83843..fcedab83843 100644
--- a/it/it-projects/dbCleaner/modules/after/module_a/module_a2/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/after/module_a/module_a2/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/tests/projects/dbCleaner/modules/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 42039538a92..42039538a92 100644
--- a/it/it-projects/dbCleaner/modules/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/tests/projects/dbCleaner/modules/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/dbCleaner/modules/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/tests/projects/dbCleaner/modules/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/modules/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/tests/projects/dbCleaner/modules/after/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/dbCleaner/modules/after/module_a/sonar-project.properties b/tests/projects/dbCleaner/modules/after/module_a/sonar-project.properties
index 7e6ca9074a4..7e6ca9074a4 100644
--- a/it/it-projects/dbCleaner/modules/after/module_a/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/after/module_a/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/after/module_c/module_c1/sonar-project.properties b/tests/projects/dbCleaner/modules/after/module_c/module_c1/sonar-project.properties
index ca8404b7bd4..ca8404b7bd4 100644
--- a/it/it-projects/dbCleaner/modules/after/module_c/module_c1/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/after/module_c/module_c1/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/after/module_c/module_c1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo b/tests/projects/dbCleaner/modules/after/module_c/module_c1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
index b83c3af128c..b83c3af128c 100644
--- a/it/it-projects/dbCleaner/modules/after/module_c/module_c1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
+++ b/tests/projects/dbCleaner/modules/after/module_c/module_c1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
diff --git a/it/it-projects/dbCleaner/modules/after/module_c/module_c1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures b/tests/projects/dbCleaner/modules/after/module_c/module_c1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/modules/after/module_c/module_c1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
+++ b/tests/projects/dbCleaner/modules/after/module_c/module_c1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
diff --git a/it/it-projects/dbCleaner/modules/after/module_c/module_c2/sonar-project.properties b/tests/projects/dbCleaner/modules/after/module_c/module_c2/sonar-project.properties
index e597dab4f33..e597dab4f33 100644
--- a/it/it-projects/dbCleaner/modules/after/module_c/module_c2/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/after/module_c/module_c2/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/after/module_c/module_c2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo b/tests/projects/dbCleaner/modules/after/module_c/module_c2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
index 20b8bb3876a..20b8bb3876a 100644
--- a/it/it-projects/dbCleaner/modules/after/module_c/module_c2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
+++ b/tests/projects/dbCleaner/modules/after/module_c/module_c2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
diff --git a/it/it-projects/dbCleaner/modules/after/module_c/module_c2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures b/tests/projects/dbCleaner/modules/after/module_c/module_c2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/modules/after/module_c/module_c2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
+++ b/tests/projects/dbCleaner/modules/after/module_c/module_c2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
diff --git a/it/it-projects/dbCleaner/modules/after/module_c/sonar-project.properties b/tests/projects/dbCleaner/modules/after/module_c/sonar-project.properties
index e379019d264..e379019d264 100644
--- a/it/it-projects/dbCleaner/modules/after/module_c/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/after/module_c/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/after/sonar-project.properties b/tests/projects/dbCleaner/modules/after/sonar-project.properties
index 6a6d185f9df..6a6d185f9df 100644
--- a/it/it-projects/dbCleaner/modules/after/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/after/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/before/module_a/module_a1/sonar-project.properties b/tests/projects/dbCleaner/modules/before/module_a/module_a1/sonar-project.properties
index a081a0e6342..a081a0e6342 100644
--- a/it/it-projects/dbCleaner/modules/before/module_a/module_a1/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/before/module_a/module_a1/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/tests/projects/dbCleaner/modules/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/it/it-projects/dbCleaner/modules/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/tests/projects/dbCleaner/modules/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/it/it-projects/dbCleaner/modules/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/tests/projects/dbCleaner/modules/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
index 737b14c6713..737b14c6713 100644
--- a/it/it-projects/dbCleaner/modules/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
+++ b/tests/projects/dbCleaner/modules/before/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
diff --git a/it/it-projects/dbCleaner/modules/before/module_a/module_a2/sonar-project.properties b/tests/projects/dbCleaner/modules/before/module_a/module_a2/sonar-project.properties
index fcedab83843..fcedab83843 100644
--- a/it/it-projects/dbCleaner/modules/before/module_a/module_a2/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/before/module_a/module_a2/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/tests/projects/dbCleaner/modules/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 42039538a92..42039538a92 100644
--- a/it/it-projects/dbCleaner/modules/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/tests/projects/dbCleaner/modules/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/dbCleaner/modules/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/tests/projects/dbCleaner/modules/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/modules/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/tests/projects/dbCleaner/modules/before/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/dbCleaner/modules/before/module_a/sonar-project.properties b/tests/projects/dbCleaner/modules/before/module_a/sonar-project.properties
index 7e6ca9074a4..7e6ca9074a4 100644
--- a/it/it-projects/dbCleaner/modules/before/module_a/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/before/module_a/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/before/module_b/module_b1/sonar-project.properties b/tests/projects/dbCleaner/modules/before/module_b/module_b1/sonar-project.properties
index ca8404b7bd4..ca8404b7bd4 100644
--- a/it/it-projects/dbCleaner/modules/before/module_b/module_b1/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/before/module_b/module_b1/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo b/tests/projects/dbCleaner/modules/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
index b83c3af128c..b83c3af128c 100644
--- a/it/it-projects/dbCleaner/modules/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
+++ b/tests/projects/dbCleaner/modules/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
diff --git a/it/it-projects/dbCleaner/modules/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures b/tests/projects/dbCleaner/modules/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/modules/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
+++ b/tests/projects/dbCleaner/modules/before/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
diff --git a/it/it-projects/dbCleaner/modules/before/module_b/module_b2/sonar-project.properties b/tests/projects/dbCleaner/modules/before/module_b/module_b2/sonar-project.properties
index e597dab4f33..e597dab4f33 100644
--- a/it/it-projects/dbCleaner/modules/before/module_b/module_b2/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/before/module_b/module_b2/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo b/tests/projects/dbCleaner/modules/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
index 20b8bb3876a..20b8bb3876a 100644
--- a/it/it-projects/dbCleaner/modules/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
+++ b/tests/projects/dbCleaner/modules/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
diff --git a/it/it-projects/dbCleaner/modules/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures b/tests/projects/dbCleaner/modules/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/modules/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
+++ b/tests/projects/dbCleaner/modules/before/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
diff --git a/it/it-projects/dbCleaner/modules/before/module_b/sonar-project.properties b/tests/projects/dbCleaner/modules/before/module_b/sonar-project.properties
index 21d69f769d3..21d69f769d3 100644
--- a/it/it-projects/dbCleaner/modules/before/module_b/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/before/module_b/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/modules/before/sonar-project.properties b/tests/projects/dbCleaner/modules/before/sonar-project.properties
index 7935cb5ffb0..7935cb5ffb0 100644
--- a/it/it-projects/dbCleaner/modules/before/sonar-project.properties
+++ b/tests/projects/dbCleaner/modules/before/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a1/sonar-project.properties b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a1/sonar-project.properties
index a081a0e6342..a081a0e6342 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a1/sonar-project.properties
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a1/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
index 737b14c6713..737b14c6713 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a2/sonar-project.properties b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a2/sonar-project.properties
index fcedab83843..fcedab83843 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a2/sonar-project.properties
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a2/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 42039538a92..42039538a92 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/sonar-project.properties b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/sonar-project.properties
index 7e6ca9074a4..7e6ca9074a4 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_a/sonar-project.properties
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_a/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b1/sonar-project.properties b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b1/sonar-project.properties
index ca8404b7bd4..ca8404b7bd4 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b1/sonar-project.properties
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b1/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
index b83c3af128c..b83c3af128c 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b2/sonar-project.properties b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b2/sonar-project.properties
index e597dab4f33..e597dab4f33 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b2/sonar-project.properties
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b2/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
index 20b8bb3876a..20b8bb3876a 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/sonar-project.properties b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/sonar-project.properties
index 21d69f769d3..21d69f769d3 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/module_b/sonar-project.properties
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/module_b/sonar-project.properties
diff --git a/it/it-projects/dbCleaner/xoo-multi-modules-sample/sonar-project.properties b/tests/projects/dbCleaner/xoo-multi-modules-sample/sonar-project.properties
index 7935cb5ffb0..7935cb5ffb0 100644
--- a/it/it-projects/dbCleaner/xoo-multi-modules-sample/sonar-project.properties
+++ b/tests/projects/dbCleaner/xoo-multi-modules-sample/sonar-project.properties
diff --git a/it/it-projects/duplications/cross-module/module1/sonar-project.properties b/tests/projects/duplications/cross-module/module1/sonar-project.properties
index a4b8c4853a5..a4b8c4853a5 100644
--- a/it/it-projects/duplications/cross-module/module1/sonar-project.properties
+++ b/tests/projects/duplications/cross-module/module1/sonar-project.properties
diff --git a/it/it-projects/duplications/cross-module/module1/src/main/xoo/sample/File1.xoo b/tests/projects/duplications/cross-module/module1/src/main/xoo/sample/File1.xoo
index 5e494b196ab..5e494b196ab 100644
--- a/it/it-projects/duplications/cross-module/module1/src/main/xoo/sample/File1.xoo
+++ b/tests/projects/duplications/cross-module/module1/src/main/xoo/sample/File1.xoo
diff --git a/it/it-projects/duplications/cross-module/module1/src/main/xoo/sample/File1.xoo.measures b/tests/projects/duplications/cross-module/module1/src/main/xoo/sample/File1.xoo.measures
index 5a79b0b5dbb..5a79b0b5dbb 100644
--- a/it/it-projects/duplications/cross-module/module1/src/main/xoo/sample/File1.xoo.measures
+++ b/tests/projects/duplications/cross-module/module1/src/main/xoo/sample/File1.xoo.measures
diff --git a/it/it-projects/duplications/cross-module/module1/src/main/xoo/sample/File2.xoo b/tests/projects/duplications/cross-module/module1/src/main/xoo/sample/File2.xoo
index 00b502d423a..00b502d423a 100644
--- a/it/it-projects/duplications/cross-module/module1/src/main/xoo/sample/File2.xoo
+++ b/tests/projects/duplications/cross-module/module1/src/main/xoo/sample/File2.xoo
diff --git a/it/it-projects/duplications/cross-module/module1/src/main/xoo/sample/File2.xoo.measures b/tests/projects/duplications/cross-module/module1/src/main/xoo/sample/File2.xoo.measures
index d90983a3e9f..d90983a3e9f 100644
--- a/it/it-projects/duplications/cross-module/module1/src/main/xoo/sample/File2.xoo.measures
+++ b/tests/projects/duplications/cross-module/module1/src/main/xoo/sample/File2.xoo.measures
diff --git a/it/it-projects/duplications/cross-module/module2/sonar-project.properties b/tests/projects/duplications/cross-module/module2/sonar-project.properties
index 0b71b3d7548..0b71b3d7548 100644
--- a/it/it-projects/duplications/cross-module/module2/sonar-project.properties
+++ b/tests/projects/duplications/cross-module/module2/sonar-project.properties
diff --git a/it/it-projects/duplications/cross-module/module2/src/main/xoo/sample/File1.xoo b/tests/projects/duplications/cross-module/module2/src/main/xoo/sample/File1.xoo
index cc0b6612812..cc0b6612812 100644
--- a/it/it-projects/duplications/cross-module/module2/src/main/xoo/sample/File1.xoo
+++ b/tests/projects/duplications/cross-module/module2/src/main/xoo/sample/File1.xoo
diff --git a/it/it-projects/duplications/cross-module/module2/src/main/xoo/sample/File1.xoo.measures b/tests/projects/duplications/cross-module/module2/src/main/xoo/sample/File1.xoo.measures
index 5a79b0b5dbb..5a79b0b5dbb 100644
--- a/it/it-projects/duplications/cross-module/module2/src/main/xoo/sample/File1.xoo.measures
+++ b/tests/projects/duplications/cross-module/module2/src/main/xoo/sample/File1.xoo.measures
diff --git a/it/it-projects/duplications/cross-module/sonar-project.properties b/tests/projects/duplications/cross-module/sonar-project.properties
index f4c7496f179..f4c7496f179 100644
--- a/it/it-projects/duplications/cross-module/sonar-project.properties
+++ b/tests/projects/duplications/cross-module/sonar-project.properties
diff --git a/it/it-projects/duplications/cross-project/duplicate/sonar-project.properties b/tests/projects/duplications/cross-project/duplicate/sonar-project.properties
index cc020389cbd..cc020389cbd 100644
--- a/it/it-projects/duplications/cross-project/duplicate/sonar-project.properties
+++ b/tests/projects/duplications/cross-project/duplicate/sonar-project.properties
diff --git a/it/it-projects/duplications/cross-project/duplicate/src/main/xoo/sample/File1.xoo b/tests/projects/duplications/cross-project/duplicate/src/main/xoo/sample/File1.xoo
index 5e494b196ab..5e494b196ab 100644
--- a/it/it-projects/duplications/cross-project/duplicate/src/main/xoo/sample/File1.xoo
+++ b/tests/projects/duplications/cross-project/duplicate/src/main/xoo/sample/File1.xoo
diff --git a/it/it-projects/duplications/cross-project/duplicate/src/main/xoo/sample/File1.xoo.measures b/tests/projects/duplications/cross-project/duplicate/src/main/xoo/sample/File1.xoo.measures
index 5a79b0b5dbb..5a79b0b5dbb 100644
--- a/it/it-projects/duplications/cross-project/duplicate/src/main/xoo/sample/File1.xoo.measures
+++ b/tests/projects/duplications/cross-project/duplicate/src/main/xoo/sample/File1.xoo.measures
diff --git a/it/it-projects/duplications/cross-project/duplicate/src/main/xoo/sample/File2.xoo b/tests/projects/duplications/cross-project/duplicate/src/main/xoo/sample/File2.xoo
index 00b502d423a..00b502d423a 100644
--- a/it/it-projects/duplications/cross-project/duplicate/src/main/xoo/sample/File2.xoo
+++ b/tests/projects/duplications/cross-project/duplicate/src/main/xoo/sample/File2.xoo
diff --git a/it/it-projects/duplications/cross-project/duplicate/src/main/xoo/sample/File2.xoo.measures b/tests/projects/duplications/cross-project/duplicate/src/main/xoo/sample/File2.xoo.measures
index d90983a3e9f..d90983a3e9f 100644
--- a/it/it-projects/duplications/cross-project/duplicate/src/main/xoo/sample/File2.xoo.measures
+++ b/tests/projects/duplications/cross-project/duplicate/src/main/xoo/sample/File2.xoo.measures
diff --git a/it/it-projects/duplications/cross-project/origin/sonar-project.properties b/tests/projects/duplications/cross-project/origin/sonar-project.properties
index cc020389cbd..cc020389cbd 100644
--- a/it/it-projects/duplications/cross-project/origin/sonar-project.properties
+++ b/tests/projects/duplications/cross-project/origin/sonar-project.properties
diff --git a/it/it-projects/duplications/cross-project/origin/src/main/xoo/sample/File1.xoo b/tests/projects/duplications/cross-project/origin/src/main/xoo/sample/File1.xoo
index cc0b6612812..cc0b6612812 100644
--- a/it/it-projects/duplications/cross-project/origin/src/main/xoo/sample/File1.xoo
+++ b/tests/projects/duplications/cross-project/origin/src/main/xoo/sample/File1.xoo
diff --git a/it/it-projects/duplications/cross-project/origin/src/main/xoo/sample/File1.xoo.measures b/tests/projects/duplications/cross-project/origin/src/main/xoo/sample/File1.xoo.measures
index 5a79b0b5dbb..5a79b0b5dbb 100644
--- a/it/it-projects/duplications/cross-project/origin/src/main/xoo/sample/File1.xoo.measures
+++ b/tests/projects/duplications/cross-project/origin/src/main/xoo/sample/File1.xoo.measures
diff --git a/it/it-projects/duplications/file-duplications/sonar-project.properties b/tests/projects/duplications/file-duplications/sonar-project.properties
index ae173196ce4..ae173196ce4 100644
--- a/it/it-projects/duplications/file-duplications/sonar-project.properties
+++ b/tests/projects/duplications/file-duplications/sonar-project.properties
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo
index 88e610b4a74..88e610b4a74 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.measures b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.measures
index 03005736cf7..03005736cf7 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.measures
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.measures
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo
index bb3cc734be4..bb3cc734be4 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.measures b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.measures
index 03005736cf7..03005736cf7 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.measures
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.measures
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory1.xoo b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory1.xoo
index 5f23377bed4..5f23377bed4 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory1.xoo
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory1.xoo
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory1.xoo.measures b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory1.xoo.measures
index c71c98ec52e..c71c98ec52e 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory1.xoo.measures
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory1.xoo.measures
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory2.xoo b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory2.xoo
index b565bfd75a2..b565bfd75a2 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory2.xoo
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory2.xoo
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory2.xoo.measures b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory2.xoo.measures
index f175998c7cc..f175998c7cc 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory2.xoo.measures
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_dir/DuplicatedLinesInSameDirectory2.xoo.measures
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo
index 6a0d3345eb7..6a0d3345eb7 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.measures b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.measures
index 5e818e5e054..5e818e5e054 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.measures
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.measures
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File1.xoo b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File1.xoo
index 8083fdec9d6..8083fdec9d6 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File1.xoo
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File1.xoo
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File1.xoo.measures b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File1.xoo.measures
index 03005736cf7..03005736cf7 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File1.xoo.measures
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File1.xoo.measures
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File2.xoo b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File2.xoo
index b76919dbd67..b76919dbd67 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File2.xoo
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File2.xoo
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File2.xoo.measures b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File2.xoo.measures
index 076450c97b0..076450c97b0 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File2.xoo.measures
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File2.xoo.measures
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File3.xoo b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File3.xoo
index 5db9d2fd221..5db9d2fd221 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File3.xoo
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File3.xoo
diff --git a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File3.xoo.measures b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File3.xoo.measures
index 9fd62445ebd..9fd62445ebd 100644
--- a/it/it-projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File3.xoo.measures
+++ b/tests/projects/duplications/file-duplications/src/main/xoo/duplicated_same_lines_within_3_files/File3.xoo.measures
diff --git a/it/it-projects/duplications/new-duplications-v1/sonar-project.properties b/tests/projects/duplications/new-duplications-v1/sonar-project.properties
index 6f0a3e53d33..6f0a3e53d33 100644
--- a/it/it-projects/duplications/new-duplications-v1/sonar-project.properties
+++ b/tests/projects/duplications/new-duplications-v1/sonar-project.properties
diff --git a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo
index 366e85ec229..366e85ec229 100644
--- a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo
+++ b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo
diff --git a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.measures b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.measures
index 57948d5b8c6..57948d5b8c6 100644
--- a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.measures
+++ b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.measures
diff --git a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.scm b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.scm
index a4f7ca6c8b0..a4f7ca6c8b0 100644
--- a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.scm
+++ b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.scm
diff --git a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo
index 366e85ec229..366e85ec229 100644
--- a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo
+++ b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo
diff --git a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.measures b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.measures
index 57948d5b8c6..57948d5b8c6 100644
--- a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.measures
+++ b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.measures
diff --git a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.scm b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.scm
index a4f7ca6c8b0..a4f7ca6c8b0 100644
--- a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.scm
+++ b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.scm
diff --git a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo
index 89addba19cf..89addba19cf 100644
--- a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo
+++ b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo
diff --git a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.measures b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.measures
index 9680b5f6c8a..9680b5f6c8a 100644
--- a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.measures
+++ b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.measures
diff --git a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.scm b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.scm
index 50df6bcf039..50df6bcf039 100644
--- a/it/it-projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.scm
+++ b/tests/projects/duplications/new-duplications-v1/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.scm
diff --git a/it/it-projects/duplications/new-duplications-v2/sonar-project.properties b/tests/projects/duplications/new-duplications-v2/sonar-project.properties
index 6f0a3e53d33..6f0a3e53d33 100644
--- a/it/it-projects/duplications/new-duplications-v2/sonar-project.properties
+++ b/tests/projects/duplications/new-duplications-v2/sonar-project.properties
diff --git a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo
index 88e610b4a74..88e610b4a74 100644
--- a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo
+++ b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo
diff --git a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.measures b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.measures
index 03005736cf7..03005736cf7 100644
--- a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.measures
+++ b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.measures
diff --git a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.scm b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.scm
index 728006a3575..728006a3575 100644
--- a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.scm
+++ b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir1/DuplicatedLinesWithOtherDirectory.xoo.scm
diff --git a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo
index 433514f17af..433514f17af 100644
--- a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo
+++ b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo
diff --git a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.measures b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.measures
index 33a558499a3..33a558499a3 100644
--- a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.measures
+++ b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.measures
diff --git a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.scm b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.scm
index 8320f408e7a..8320f408e7a 100644
--- a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.scm
+++ b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_with_other_dir2/DuplicatedLinesWithOtherDirectory.xoo.scm
diff --git a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo
index a0d79b856c6..a0d79b856c6 100644
--- a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo
+++ b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo
diff --git a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.measures b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.measures
index 2fb2025cb32..2fb2025cb32 100644
--- a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.measures
+++ b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.measures
diff --git a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.scm b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.scm
index f3cf9706ffa..f3cf9706ffa 100644
--- a/it/it-projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.scm
+++ b/tests/projects/duplications/new-duplications-v2/src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo.scm
diff --git a/it/it-projects/exclusions/exclusions/sonar-project.properties b/tests/projects/exclusions/exclusions/sonar-project.properties
index 8b26cec2224..8b26cec2224 100644
--- a/it/it-projects/exclusions/exclusions/sonar-project.properties
+++ b/tests/projects/exclusions/exclusions/sonar-project.properties
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/FileOnRootFolder.xoo b/tests/projects/exclusions/exclusions/src/main/xoo/FileOnRootFolder.xoo
index 52d311f7e38..52d311f7e38 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/FileOnRootFolder.xoo
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/FileOnRootFolder.xoo
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/FileOnRootFolder.xoo.measures b/tests/projects/exclusions/exclusions/src/main/xoo/FileOnRootFolder.xoo.measures
index 7bb5f438500..7bb5f438500 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/FileOnRootFolder.xoo.measures
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/FileOnRootFolder.xoo.measures
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassOne.xoo b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassOne.xoo
index be537077200..be537077200 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassOne.xoo
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassOne.xoo
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassOne.xoo.measures b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassOne.xoo.measures
index 7f28308edeb..7f28308edeb 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassOne.xoo.measures
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassOne.xoo.measures
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToExclude.xoo b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToExclude.xoo
index 6e7c3f7ba16..6e7c3f7ba16 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToExclude.xoo
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToExclude.xoo
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToExclude.xoo.measures b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToExclude.xoo.measures
index 9c54091bef9..9c54091bef9 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToExclude.xoo.measures
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToExclude.xoo.measures
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToIgnoreGlobally.xoo b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToIgnoreGlobally.xoo
index 1db5746a7b5..1db5746a7b5 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToIgnoreGlobally.xoo
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToIgnoreGlobally.xoo
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToIgnoreGlobally.xoo.measures b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToIgnoreGlobally.xoo.measures
index 1fa2c73b3d0..1fa2c73b3d0 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToIgnoreGlobally.xoo.measures
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassToIgnoreGlobally.xoo.measures
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassTwo.xoo b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassTwo.xoo
index 8d6db94e588..8d6db94e588 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassTwo.xoo
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassTwo.xoo
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassTwo.xoo.measures b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassTwo.xoo.measures
index 7da3c1fffef..7da3c1fffef 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassTwo.xoo.measures
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/ClassTwo.xoo.measures
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/NoSonarComment.xoo b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/NoSonarComment.xoo
index 206d72ba6ac..206d72ba6ac 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/NoSonarComment.xoo
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/NoSonarComment.xoo
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/NoSonarComment.xoo.measures b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/NoSonarComment.xoo.measures
index 69a10eb19d4..69a10eb19d4 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/NoSonarComment.xoo.measures
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/NoSonarComment.xoo.measures
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/packageToExclude/ClassThree.xoo b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/packageToExclude/ClassThree.xoo
index e91881c4ba5..e91881c4ba5 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/packageToExclude/ClassThree.xoo
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/packageToExclude/ClassThree.xoo
diff --git a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/packageToExclude/ClassThree.xoo.measures b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/packageToExclude/ClassThree.xoo.measures
index 7da3c1fffef..7da3c1fffef 100644
--- a/it/it-projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/packageToExclude/ClassThree.xoo.measures
+++ b/tests/projects/exclusions/exclusions/src/main/xoo/org/sonar/tests/packageToExclude/ClassThree.xoo.measures
diff --git a/it/it-projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassOneTest.xoo b/tests/projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassOneTest.xoo
index 8c0967e496f..8c0967e496f 100644
--- a/it/it-projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassOneTest.xoo
+++ b/tests/projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassOneTest.xoo
diff --git a/it/it-projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassOneTest.xoo.measures b/tests/projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassOneTest.xoo.measures
index 80cbee5aba9..80cbee5aba9 100644
--- a/it/it-projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassOneTest.xoo.measures
+++ b/tests/projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassOneTest.xoo.measures
diff --git a/it/it-projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassToExcludeTest.xoo b/tests/projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassToExcludeTest.xoo
index 712e2ec4a4a..712e2ec4a4a 100644
--- a/it/it-projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassToExcludeTest.xoo
+++ b/tests/projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassToExcludeTest.xoo
diff --git a/it/it-projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassToExcludeTest.xoo.measures b/tests/projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassToExcludeTest.xoo.measures
index 7424f2634f5..7424f2634f5 100644
--- a/it/it-projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassToExcludeTest.xoo.measures
+++ b/tests/projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassToExcludeTest.xoo.measures
diff --git a/it/it-projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassTwoTest.xoo b/tests/projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassTwoTest.xoo
index 1239ee5276c..1239ee5276c 100644
--- a/it/it-projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassTwoTest.xoo
+++ b/tests/projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassTwoTest.xoo
diff --git a/it/it-projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassTwoTest.xoo.measures b/tests/projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassTwoTest.xoo.measures
index 80cbee5aba9..80cbee5aba9 100644
--- a/it/it-projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassTwoTest.xoo.measures
+++ b/tests/projects/exclusions/exclusions/src/test/xoo/org/sonar/tests/ClassTwoTest.xoo.measures
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_a/module_a1/sonar-project.properties b/tests/projects/exclusions/xoo-multi-modules/module_a/module_a1/sonar-project.properties
index a081a0e6342..a081a0e6342 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_a/module_a1/sonar-project.properties
+++ b/tests/projects/exclusions/xoo-multi-modules/module_a/module_a1/sonar-project.properties
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/tests/projects/exclusions/xoo-multi-modules/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 7e61727a85a..7e61727a85a 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/tests/projects/exclusions/xoo-multi-modules/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/tests/projects/exclusions/xoo-multi-modules/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
+++ b/tests/projects/exclusions/xoo-multi-modules/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_a/module_a2/sonar-project.properties b/tests/projects/exclusions/xoo-multi-modules/module_a/module_a2/sonar-project.properties
index fcedab83843..fcedab83843 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_a/module_a2/sonar-project.properties
+++ b/tests/projects/exclusions/xoo-multi-modules/module_a/module_a2/sonar-project.properties
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/tests/projects/exclusions/xoo-multi-modules/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 4cf0ec94f03..4cf0ec94f03 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/tests/projects/exclusions/xoo-multi-modules/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/tests/projects/exclusions/xoo-multi-modules/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/tests/projects/exclusions/xoo-multi-modules/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_a/sonar-project.properties b/tests/projects/exclusions/xoo-multi-modules/module_a/sonar-project.properties
index 7e6ca9074a4..7e6ca9074a4 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_a/sonar-project.properties
+++ b/tests/projects/exclusions/xoo-multi-modules/module_a/sonar-project.properties
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_b/module_b1/sonar-project.properties b/tests/projects/exclusions/xoo-multi-modules/module_b/module_b1/sonar-project.properties
index ca8404b7bd4..ca8404b7bd4 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_b/module_b1/sonar-project.properties
+++ b/tests/projects/exclusions/xoo-multi-modules/module_b/module_b1/sonar-project.properties
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo b/tests/projects/exclusions/xoo-multi-modules/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
index b83c3af128c..b83c3af128c 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
+++ b/tests/projects/exclusions/xoo-multi-modules/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures b/tests/projects/exclusions/xoo-multi-modules/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
+++ b/tests/projects/exclusions/xoo-multi-modules/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_b/module_b2/sonar-project.properties b/tests/projects/exclusions/xoo-multi-modules/module_b/module_b2/sonar-project.properties
index e597dab4f33..e597dab4f33 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_b/module_b2/sonar-project.properties
+++ b/tests/projects/exclusions/xoo-multi-modules/module_b/module_b2/sonar-project.properties
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo b/tests/projects/exclusions/xoo-multi-modules/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
index 20b8bb3876a..20b8bb3876a 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
+++ b/tests/projects/exclusions/xoo-multi-modules/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures b/tests/projects/exclusions/xoo-multi-modules/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
+++ b/tests/projects/exclusions/xoo-multi-modules/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
diff --git a/it/it-projects/exclusions/xoo-multi-modules/module_b/sonar-project.properties b/tests/projects/exclusions/xoo-multi-modules/module_b/sonar-project.properties
index 21d69f769d3..21d69f769d3 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/module_b/sonar-project.properties
+++ b/tests/projects/exclusions/xoo-multi-modules/module_b/sonar-project.properties
diff --git a/it/it-projects/exclusions/xoo-multi-modules/sonar-project.properties b/tests/projects/exclusions/xoo-multi-modules/sonar-project.properties
index 9ba45876d2b..9ba45876d2b 100644
--- a/it/it-projects/exclusions/xoo-multi-modules/sonar-project.properties
+++ b/tests/projects/exclusions/xoo-multi-modules/sonar-project.properties
diff --git a/it/it-projects/highlighting/xoo-sample-with-highlighting-v1/sonar-project.properties b/tests/projects/highlighting/xoo-sample-with-highlighting-v1/sonar-project.properties
index 8ec6e295138..8ec6e295138 100644
--- a/it/it-projects/highlighting/xoo-sample-with-highlighting-v1/sonar-project.properties
+++ b/tests/projects/highlighting/xoo-sample-with-highlighting-v1/sonar-project.properties
diff --git a/it/it-projects/issue/xoo-with-scm/src/main/xoo/sample/Sample.xoo b/tests/projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/issue/xoo-with-scm/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo
diff --git a/tests/projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo.highlighting b/tests/projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo.highlighting
new file mode 100644
index 00000000000..e68b1926c4c
--- /dev/null
+++ b/tests/projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo.highlighting
@@ -0,0 +1,15 @@
+#package
+0:7:k
+#public
+17:23:k
+#class
+24:29:k
+#public
+42:48:k
+#private
+86:93:k
+#return
+#Here CSS class is wrong (it should be "k") and will be fixed during next analysis
+116:122:s
+#"hello"
+123:130:s
diff --git a/it/it-projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo.measures
index f95d11f14d0..f95d11f14d0 100644
--- a/it/it-projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/highlighting/xoo-sample-with-highlighting-v2/sonar-project.properties b/tests/projects/highlighting/xoo-sample-with-highlighting-v2/sonar-project.properties
index 8ec6e295138..8ec6e295138 100644
--- a/it/it-projects/highlighting/xoo-sample-with-highlighting-v2/sonar-project.properties
+++ b/tests/projects/highlighting/xoo-sample-with-highlighting-v2/sonar-project.properties
diff --git a/it/it-projects/qualitygate/xoo-sample/src/sample/Sample.xoo b/tests/projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/qualitygate/xoo-sample/src/sample/Sample.xoo
+++ b/tests/projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.highlighting b/tests/projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.highlighting
index 6acb0fa312e..cf76f1ca82b 100644
--- a/it/it-projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.highlighting
+++ b/tests/projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.highlighting
@@ -1,14 +1,14 @@
 #package
 0:7:k
 #public
-19:25:k
+17:23:k
 #class
-26:31:k
+24:29:k
 #public
-46:52:k
+42:48:k
 #private
-94:101:k
+86:93:k
 #return
-125:131:k
+116:122:k
 #"hello"
-132:139:s
\ No newline at end of file
+123:130:s
diff --git a/it/it-projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.measures
index f95d11f14d0..f95d11f14d0 100644
--- a/it/it-projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.measures
diff --git a/tests/projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.symbol b/tests/projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.symbol
new file mode 100644
index 00000000000..df5ff210261
--- /dev/null
+++ b/tests/projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo.symbol
@@ -0,0 +1,4 @@
+#j
+71:72
+#i
+60:61,75:76
diff --git a/it/it-projects/issue/AutoAssignTest/sonar-project.properties b/tests/projects/issue/AutoAssignTest/sonar-project.properties
index 3a14309e6c2..3a14309e6c2 100644
--- a/it/it-projects/issue/AutoAssignTest/sonar-project.properties
+++ b/tests/projects/issue/AutoAssignTest/sonar-project.properties
diff --git a/it/it-projects/issue/AutoAssignTest/src/sample.xoo b/tests/projects/issue/AutoAssignTest/src/sample.xoo
index 83572801d71..83572801d71 100644
--- a/it/it-projects/issue/AutoAssignTest/src/sample.xoo
+++ b/tests/projects/issue/AutoAssignTest/src/sample.xoo
diff --git a/it/it-projects/issue/AutoAssignTest/src/sample.xoo.measures b/tests/projects/issue/AutoAssignTest/src/sample.xoo.measures
index 7bb5f438500..7bb5f438500 100644
--- a/it/it-projects/issue/AutoAssignTest/src/sample.xoo.measures
+++ b/tests/projects/issue/AutoAssignTest/src/sample.xoo.measures
diff --git a/it/it-projects/issue/AutoAssignTest/src/sample.xoo.scm b/tests/projects/issue/AutoAssignTest/src/sample.xoo.scm
index d469fe05994..d469fe05994 100644
--- a/it/it-projects/issue/AutoAssignTest/src/sample.xoo.scm
+++ b/tests/projects/issue/AutoAssignTest/src/sample.xoo.scm
diff --git a/it/it-projects/issue/common-rules/sonar-project.properties b/tests/projects/issue/common-rules/sonar-project.properties
index 6cf4f389266..6cf4f389266 100644
--- a/it/it-projects/issue/common-rules/sonar-project.properties
+++ b/tests/projects/issue/common-rules/sonar-project.properties
diff --git a/it/it-projects/issue/common-rules/src/Sample.xoo b/tests/projects/issue/common-rules/src/Sample.xoo
index 33b8509208c..33b8509208c 100644
--- a/it/it-projects/issue/common-rules/src/Sample.xoo
+++ b/tests/projects/issue/common-rules/src/Sample.xoo
diff --git a/it/it-projects/issue/common-rules/src/Sample.xoo.measures b/tests/projects/issue/common-rules/src/Sample.xoo.measures
index 16cc5ac1540..16cc5ac1540 100644
--- a/it/it-projects/issue/common-rules/src/Sample.xoo.measures
+++ b/tests/projects/issue/common-rules/src/Sample.xoo.measures
diff --git a/it/it-projects/issue/common-rules/test/SampleTest.xoo b/tests/projects/issue/common-rules/test/SampleTest.xoo
index 6ec4b534517..6ec4b534517 100644
--- a/it/it-projects/issue/common-rules/test/SampleTest.xoo
+++ b/tests/projects/issue/common-rules/test/SampleTest.xoo
diff --git a/it/it-projects/issue/common-rules/test/SampleTest.xoo.measures b/tests/projects/issue/common-rules/test/SampleTest.xoo.measures
index ea3e2796581..ea3e2796581 100644
--- a/it/it-projects/issue/common-rules/test/SampleTest.xoo.measures
+++ b/tests/projects/issue/common-rules/test/SampleTest.xoo.measures
diff --git a/it/it-projects/issue/creationDateSampleChanged/sonar-project.properties b/tests/projects/issue/creationDateSampleChanged/sonar-project.properties
index 3a25a96024f..3a25a96024f 100644
--- a/it/it-projects/issue/creationDateSampleChanged/sonar-project.properties
+++ b/tests/projects/issue/creationDateSampleChanged/sonar-project.properties
diff --git a/it/it-projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndModified.xoo b/tests/projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndModified.xoo
index 2e3e81d8300..2e3e81d8300 100644
--- a/it/it-projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndModified.xoo
+++ b/tests/projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndModified.xoo
diff --git a/it/it-projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndModified.xoo.scm b/tests/projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndModified.xoo.scm
index f8c205d4d68..f8c205d4d68 100644
--- a/it/it-projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndModified.xoo.scm
+++ b/tests/projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndModified.xoo.scm
diff --git a/it/it-projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndUnmodified.xoo b/tests/projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndUnmodified.xoo
index 3d80cf8da75..3d80cf8da75 100644
--- a/it/it-projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndUnmodified.xoo
+++ b/tests/projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndUnmodified.xoo
diff --git a/it/it-projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndUnmodified.xoo.scm b/tests/projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndUnmodified.xoo.scm
index 3272e3e6ed8..3272e3e6ed8 100644
--- a/it/it-projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndUnmodified.xoo.scm
+++ b/tests/projects/issue/creationDateSampleChanged/src/main/xoo/sample/ForeverAndUnmodified.xoo.scm
diff --git a/it/it-projects/issue/creationDateSampleChanged/src/main/xoo/sample/OnlyInChanged.xoo b/tests/projects/issue/creationDateSampleChanged/src/main/xoo/sample/OnlyInChanged.xoo
index 0a96b5c9ddb..0a96b5c9ddb 100644
--- a/it/it-projects/issue/creationDateSampleChanged/src/main/xoo/sample/OnlyInChanged.xoo
+++ b/tests/projects/issue/creationDateSampleChanged/src/main/xoo/sample/OnlyInChanged.xoo
diff --git a/it/it-projects/issue/creationDateSampleChanged/src/main/xoo/sample/OnlyInChanged.xoo.scm b/tests/projects/issue/creationDateSampleChanged/src/main/xoo/sample/OnlyInChanged.xoo.scm
index 59c11db6b3b..59c11db6b3b 100644
--- a/it/it-projects/issue/creationDateSampleChanged/src/main/xoo/sample/OnlyInChanged.xoo.scm
+++ b/tests/projects/issue/creationDateSampleChanged/src/main/xoo/sample/OnlyInChanged.xoo.scm
diff --git a/it/it-projects/issue/creationDateSampleInitial/sonar-project.properties b/tests/projects/issue/creationDateSampleInitial/sonar-project.properties
index 3a25a96024f..3a25a96024f 100644
--- a/it/it-projects/issue/creationDateSampleInitial/sonar-project.properties
+++ b/tests/projects/issue/creationDateSampleInitial/sonar-project.properties
diff --git a/it/it-projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndModified.xoo b/tests/projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndModified.xoo
index 4b6e8b8d818..4b6e8b8d818 100644
--- a/it/it-projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndModified.xoo
+++ b/tests/projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndModified.xoo
diff --git a/it/it-projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndModified.xoo.scm b/tests/projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndModified.xoo.scm
index 654a775e4ef..654a775e4ef 100644
--- a/it/it-projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndModified.xoo.scm
+++ b/tests/projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndModified.xoo.scm
diff --git a/it/it-projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndUnmodified.xoo b/tests/projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndUnmodified.xoo
index 3d80cf8da75..3d80cf8da75 100644
--- a/it/it-projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndUnmodified.xoo
+++ b/tests/projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndUnmodified.xoo
diff --git a/it/it-projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndUnmodified.xoo.scm b/tests/projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndUnmodified.xoo.scm
index 3272e3e6ed8..3272e3e6ed8 100644
--- a/it/it-projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndUnmodified.xoo.scm
+++ b/tests/projects/issue/creationDateSampleInitial/src/main/xoo/sample/ForeverAndUnmodified.xoo.scm
diff --git a/it/it-projects/issue/creationDateSampleInitial/src/main/xoo/sample/OnlyInInitial.xoo b/tests/projects/issue/creationDateSampleInitial/src/main/xoo/sample/OnlyInInitial.xoo
index 969fc44abfe..969fc44abfe 100644
--- a/it/it-projects/issue/creationDateSampleInitial/src/main/xoo/sample/OnlyInInitial.xoo
+++ b/tests/projects/issue/creationDateSampleInitial/src/main/xoo/sample/OnlyInInitial.xoo
diff --git a/it/it-projects/issue/creationDateSampleInitial/src/main/xoo/sample/OnlyInInitial.xoo.scm b/tests/projects/issue/creationDateSampleInitial/src/main/xoo/sample/OnlyInInitial.xoo.scm
index 65099dbec9b..65099dbec9b 100644
--- a/it/it-projects/issue/creationDateSampleInitial/src/main/xoo/sample/OnlyInInitial.xoo.scm
+++ b/tests/projects/issue/creationDateSampleInitial/src/main/xoo/sample/OnlyInInitial.xoo.scm
diff --git a/it/it-projects/issue/workflow/sonar-project.properties b/tests/projects/issue/workflow/sonar-project.properties
index fbfcc6930d0..fbfcc6930d0 100644
--- a/it/it-projects/issue/workflow/sonar-project.properties
+++ b/tests/projects/issue/workflow/sonar-project.properties
diff --git a/it/it-projects/issue/workflow/src/Sample.xoo b/tests/projects/issue/workflow/src/Sample.xoo
index e2ae9e37278..e2ae9e37278 100644
--- a/it/it-projects/issue/workflow/src/Sample.xoo
+++ b/tests/projects/issue/workflow/src/Sample.xoo
diff --git a/it/it-projects/issue/workflow/src/Sample.xoo.measures b/tests/projects/issue/workflow/src/Sample.xoo.measures
index 16cc5ac1540..16cc5ac1540 100644
--- a/it/it-projects/issue/workflow/src/Sample.xoo.measures
+++ b/tests/projects/issue/workflow/src/Sample.xoo.measures
diff --git a/it/it-projects/issue/xoo-sample-v2/sonar-project.properties b/tests/projects/issue/xoo-sample-v2/sonar-project.properties
index e01f062e51b..e01f062e51b 100644
--- a/it/it-projects/issue/xoo-sample-v2/sonar-project.properties
+++ b/tests/projects/issue/xoo-sample-v2/sonar-project.properties
diff --git a/it/it-projects/issue/xoo-sample-v2/src/main/xoo/sample/Sample.xoo b/tests/projects/issue/xoo-sample-v2/src/main/xoo/sample/Sample.xoo
index df0c06c819a..df0c06c819a 100644
--- a/it/it-projects/issue/xoo-sample-v2/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/issue/xoo-sample-v2/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/issue/xoo-sample-v2/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/issue/xoo-sample-v2/src/main/xoo/sample/Sample.xoo.measures
index dfbfb619ed6..dfbfb619ed6 100644
--- a/it/it-projects/issue/xoo-sample-v2/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/issue/xoo-sample-v2/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/issue/xoo-tracking-v1/sonar-project.properties b/tests/projects/issue/xoo-tracking-v1/sonar-project.properties
index e01f062e51b..e01f062e51b 100644
--- a/it/it-projects/issue/xoo-tracking-v1/sonar-project.properties
+++ b/tests/projects/issue/xoo-tracking-v1/sonar-project.properties
diff --git a/it/it-projects/issue/xoo-tracking-v1/src/main/xoo/sample/Sample.xoo b/tests/projects/issue/xoo-tracking-v1/src/main/xoo/sample/Sample.xoo
index 35add5680b9..35add5680b9 100644
--- a/it/it-projects/issue/xoo-tracking-v1/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/issue/xoo-tracking-v1/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/issue/xoo-tracking-v1/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/issue/xoo-tracking-v1/src/main/xoo/sample/Sample.xoo.measures
index e1f9a919116..e1f9a919116 100644
--- a/it/it-projects/issue/xoo-tracking-v1/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/issue/xoo-tracking-v1/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/issue/xoo-tracking-v2/sonar-project.properties b/tests/projects/issue/xoo-tracking-v2/sonar-project.properties
index e01f062e51b..e01f062e51b 100644
--- a/it/it-projects/issue/xoo-tracking-v2/sonar-project.properties
+++ b/tests/projects/issue/xoo-tracking-v2/sonar-project.properties
diff --git a/it/it-projects/issue/xoo-tracking-v2/src/main/xoo/sample/Sample.xoo b/tests/projects/issue/xoo-tracking-v2/src/main/xoo/sample/Sample.xoo
index cf41280618f..cf41280618f 100644
--- a/it/it-projects/issue/xoo-tracking-v2/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/issue/xoo-tracking-v2/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/issue/xoo-tracking-v2/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/issue/xoo-tracking-v2/src/main/xoo/sample/Sample.xoo.measures
index bbc3f39eb62..bbc3f39eb62 100644
--- a/it/it-projects/issue/xoo-tracking-v2/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/issue/xoo-tracking-v2/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/issue/xoo-tracking-v3/sonar-project.properties b/tests/projects/issue/xoo-tracking-v3/sonar-project.properties
index e01f062e51b..e01f062e51b 100644
--- a/it/it-projects/issue/xoo-tracking-v3/sonar-project.properties
+++ b/tests/projects/issue/xoo-tracking-v3/sonar-project.properties
diff --git a/it/it-projects/issue/xoo-tracking-v3/src/main/xoo/sample/Sample2.xoo b/tests/projects/issue/xoo-tracking-v3/src/main/xoo/sample/Sample2.xoo
index 35add5680b9..35add5680b9 100644
--- a/it/it-projects/issue/xoo-tracking-v3/src/main/xoo/sample/Sample2.xoo
+++ b/tests/projects/issue/xoo-tracking-v3/src/main/xoo/sample/Sample2.xoo
diff --git a/it/it-projects/issue/xoo-tracking-v3/src/main/xoo/sample/Sample2.xoo.measures b/tests/projects/issue/xoo-tracking-v3/src/main/xoo/sample/Sample2.xoo.measures
index e1f9a919116..e1f9a919116 100644
--- a/it/it-projects/issue/xoo-tracking-v3/src/main/xoo/sample/Sample2.xoo.measures
+++ b/tests/projects/issue/xoo-tracking-v3/src/main/xoo/sample/Sample2.xoo.measures
diff --git a/it/it-projects/issue/xoo-with-scm/sonar-project.properties b/tests/projects/issue/xoo-with-scm/sonar-project.properties
index 90da9733771..90da9733771 100644
--- a/it/it-projects/issue/xoo-with-scm/sonar-project.properties
+++ b/tests/projects/issue/xoo-with-scm/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-sample-with-tests/src/main/xoo/sample/Sample.xoo b/tests/projects/issue/xoo-with-scm/src/main/xoo/sample/Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/shared/xoo-sample-with-tests/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/issue/xoo-with-scm/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/issue/xoo-with-scm/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/issue/xoo-with-scm/src/main/xoo/sample/Sample.xoo.measures
index 592bb930674..592bb930674 100644
--- a/it/it-projects/issue/xoo-with-scm/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/issue/xoo-with-scm/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/issue/xoo-with-scm/src/main/xoo/sample/Sample.xoo.scm b/tests/projects/issue/xoo-with-scm/src/main/xoo/sample/Sample.xoo.scm
index f77a3b3930f..f77a3b3930f 100644
--- a/it/it-projects/issue/xoo-with-scm/src/main/xoo/sample/Sample.xoo.scm
+++ b/tests/projects/issue/xoo-with-scm/src/main/xoo/sample/Sample.xoo.scm
diff --git a/it/it-projects/measure/xoo-history-v1/sonar-project.properties b/tests/projects/measure/xoo-history-v1/sonar-project.properties
index e01f062e51b..e01f062e51b 100644
--- a/it/it-projects/measure/xoo-history-v1/sonar-project.properties
+++ b/tests/projects/measure/xoo-history-v1/sonar-project.properties
diff --git a/it/it-projects/measure/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo b/tests/projects/measure/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo
index 2b0288fc971..2b0288fc971 100644
--- a/it/it-projects/measure/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo
+++ b/tests/projects/measure/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo
diff --git a/it/it-projects/measure/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo.measures b/tests/projects/measure/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/measure/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo.measures
+++ b/tests/projects/measure/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo.measures
diff --git a/it/it-projects/measure/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo b/tests/projects/measure/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo
index 2b0288fc971..2b0288fc971 100644
--- a/it/it-projects/measure/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo
+++ b/tests/projects/measure/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo
diff --git a/it/it-projects/measure/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo.measures b/tests/projects/measure/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/measure/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo.measures
+++ b/tests/projects/measure/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo.measures
diff --git a/it/it-projects/measure/xoo-history-v2/sonar-project.properties b/tests/projects/measure/xoo-history-v2/sonar-project.properties
index e01f062e51b..e01f062e51b 100644
--- a/it/it-projects/measure/xoo-history-v2/sonar-project.properties
+++ b/tests/projects/measure/xoo-history-v2/sonar-project.properties
diff --git a/it/it-projects/measure/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo b/tests/projects/measure/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
index b0fd1087030..b0fd1087030 100644
--- a/it/it-projects/measure/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
+++ b/tests/projects/measure/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
diff --git a/it/it-projects/measure/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures b/tests/projects/measure/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
index 66ba834e1ef..66ba834e1ef 100644
--- a/it/it-projects/measure/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
+++ b/tests/projects/measure/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
diff --git a/it/it-projects/measure/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo b/tests/projects/measure/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
index 393111bbab0..393111bbab0 100644
--- a/it/it-projects/measure/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
+++ b/tests/projects/measure/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
diff --git a/it/it-projects/measure/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures b/tests/projects/measure/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
index 71d60758637..71d60758637 100644
--- a/it/it-projects/measure/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
+++ b/tests/projects/measure/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
diff --git a/it/it-projects/measure/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo b/tests/projects/measure/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
index 2b0288fc971..2b0288fc971 100644
--- a/it/it-projects/measure/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
+++ b/tests/projects/measure/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
diff --git a/it/it-projects/measure/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures b/tests/projects/measure/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/measure/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
+++ b/tests/projects/measure/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
diff --git a/it/it-projects/measure/xoo-new-debt-ratio-v1/sonar-project.properties b/tests/projects/measure/xoo-new-debt-ratio-v1/sonar-project.properties
index 4ea4c91bacb..4ea4c91bacb 100644
--- a/it/it-projects/measure/xoo-new-debt-ratio-v1/sonar-project.properties
+++ b/tests/projects/measure/xoo-new-debt-ratio-v1/sonar-project.properties
diff --git a/it/it-projects/measure/xoo-new-debt-ratio-v1/src/main/xoo/sample/Sample.xoo b/tests/projects/measure/xoo-new-debt-ratio-v1/src/main/xoo/sample/Sample.xoo
index 467e82d8f2c..467e82d8f2c 100644
--- a/it/it-projects/measure/xoo-new-debt-ratio-v1/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/measure/xoo-new-debt-ratio-v1/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/measure/xoo-new-debt-ratio-v1/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/measure/xoo-new-debt-ratio-v1/src/main/xoo/sample/Sample.xoo.measures
index 874fe7bfea5..874fe7bfea5 100644
--- a/it/it-projects/measure/xoo-new-debt-ratio-v1/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/measure/xoo-new-debt-ratio-v1/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/measure/xoo-new-debt-ratio-v1/src/main/xoo/sample/Sample.xoo.scm b/tests/projects/measure/xoo-new-debt-ratio-v1/src/main/xoo/sample/Sample.xoo.scm
index c838f29021f..c838f29021f 100644
--- a/it/it-projects/measure/xoo-new-debt-ratio-v1/src/main/xoo/sample/Sample.xoo.scm
+++ b/tests/projects/measure/xoo-new-debt-ratio-v1/src/main/xoo/sample/Sample.xoo.scm
diff --git a/it/it-projects/measure/xoo-new-debt-ratio-v2/sonar-project.properties b/tests/projects/measure/xoo-new-debt-ratio-v2/sonar-project.properties
index 4ea4c91bacb..4ea4c91bacb 100644
--- a/it/it-projects/measure/xoo-new-debt-ratio-v2/sonar-project.properties
+++ b/tests/projects/measure/xoo-new-debt-ratio-v2/sonar-project.properties
diff --git a/it/it-projects/measure/xoo-new-debt-ratio-v2/src/main/xoo/sample/Sample.xoo b/tests/projects/measure/xoo-new-debt-ratio-v2/src/main/xoo/sample/Sample.xoo
index 882793391e0..882793391e0 100644
--- a/it/it-projects/measure/xoo-new-debt-ratio-v2/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/measure/xoo-new-debt-ratio-v2/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/measure/xoo-new-debt-ratio-v2/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/measure/xoo-new-debt-ratio-v2/src/main/xoo/sample/Sample.xoo.measures
index 98f63c1fe47..98f63c1fe47 100644
--- a/it/it-projects/measure/xoo-new-debt-ratio-v2/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/measure/xoo-new-debt-ratio-v2/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/measure/xoo-new-debt-ratio-v2/src/main/xoo/sample/Sample.xoo.scm b/tests/projects/measure/xoo-new-debt-ratio-v2/src/main/xoo/sample/Sample.xoo.scm
index bc69cd71308..bc69cd71308 100644
--- a/it/it-projects/measure/xoo-new-debt-ratio-v2/src/main/xoo/sample/Sample.xoo.scm
+++ b/tests/projects/measure/xoo-new-debt-ratio-v2/src/main/xoo/sample/Sample.xoo.scm
diff --git a/it/it-projects/measure/xoo-new-debt-ratio-v3/sonar-project.properties b/tests/projects/measure/xoo-new-debt-ratio-v3/sonar-project.properties
index 4ea4c91bacb..4ea4c91bacb 100644
--- a/it/it-projects/measure/xoo-new-debt-ratio-v3/sonar-project.properties
+++ b/tests/projects/measure/xoo-new-debt-ratio-v3/sonar-project.properties
diff --git a/it/it-projects/measure/xoo-new-debt-ratio-v3/src/main/xoo/sample/Sample.xoo b/tests/projects/measure/xoo-new-debt-ratio-v3/src/main/xoo/sample/Sample.xoo
index 0b9e023d079..0b9e023d079 100644
--- a/it/it-projects/measure/xoo-new-debt-ratio-v3/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/measure/xoo-new-debt-ratio-v3/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/measure/xoo-new-debt-ratio-v3/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/measure/xoo-new-debt-ratio-v3/src/main/xoo/sample/Sample.xoo.measures
index d467f571f3f..d467f571f3f 100644
--- a/it/it-projects/measure/xoo-new-debt-ratio-v3/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/measure/xoo-new-debt-ratio-v3/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/measure/xoo-new-debt-ratio-v3/src/main/xoo/sample/Sample.xoo.scm b/tests/projects/measure/xoo-new-debt-ratio-v3/src/main/xoo/sample/Sample.xoo.scm
index 09a256f6527..09a256f6527 100644
--- a/it/it-projects/measure/xoo-new-debt-ratio-v3/src/main/xoo/sample/Sample.xoo.scm
+++ b/tests/projects/measure/xoo-new-debt-ratio-v3/src/main/xoo/sample/Sample.xoo.scm
diff --git a/it/it-projects/measureHistory/xoo-multi-files-sample/sonar-project.properties b/tests/projects/measureHistory/xoo-multi-files-sample/sonar-project.properties
index 59af7dfeaca..59af7dfeaca 100644
--- a/it/it-projects/measureHistory/xoo-multi-files-sample/sonar-project.properties
+++ b/tests/projects/measureHistory/xoo-multi-files-sample/sonar-project.properties
diff --git a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File1.xoo b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File1.xoo
+++ b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File1.xoo
diff --git a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File1.xoo.measures b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File1.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File1.xoo.measures
+++ b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File1.xoo.measures
diff --git a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File2.xoo b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File2.xoo
index 796d90cfad5..796d90cfad5 100644
--- a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File2.xoo
+++ b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File2.xoo
diff --git a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File2.xoo.measures b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File2.xoo.measures
index 63df5add6d4..63df5add6d4 100644
--- a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File2.xoo.measures
+++ b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File2.xoo.measures
diff --git a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File3.xoo b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File3.xoo
index b83c3af128c..b83c3af128c 100644
--- a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File3.xoo
+++ b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File3.xoo
diff --git a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File3.xoo.measures b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File3.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File3.xoo.measures
+++ b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File3.xoo.measures
diff --git a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File4.xoo b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File4.xoo
index 20b8bb3876a..20b8bb3876a 100644
--- a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File4.xoo
+++ b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File4.xoo
diff --git a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File4.xoo.measures b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File4.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File4.xoo.measures
+++ b/tests/projects/measureHistory/xoo-multi-files-sample/src/main/xoo/sample/File4.xoo.measures
diff --git a/tests/perf/projects/huge-file/pom.xml b/tests/projects/performance/huge-file/pom.xml
index d5a69b06339..d5a69b06339 100644
--- a/tests/perf/projects/huge-file/pom.xml
+++ b/tests/projects/performance/huge-file/pom.xml
diff --git a/tests/perf/projects/huge-file/src/main/java/huge/HugeFile.java b/tests/projects/performance/huge-file/src/main/java/huge/HugeFile.java
index 5d6c1643294..5d6c1643294 100644
--- a/tests/perf/projects/huge-file/src/main/java/huge/HugeFile.java
+++ b/tests/projects/performance/huge-file/src/main/java/huge/HugeFile.java
diff --git a/tests/perf/projects/xoo-sample/sonar-project.properties b/tests/projects/performance/xoo-sample/sonar-project.properties
index 318ff23471b..318ff23471b 100644
--- a/tests/perf/projects/xoo-sample/sonar-project.properties
+++ b/tests/projects/performance/xoo-sample/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-two-letters-named/src/main/xoo/sample/Sample.xoo b/tests/projects/performance/xoo-sample/src/main/xoo/sample/Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/shared/xoo-two-letters-named/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/performance/xoo-sample/src/main/xoo/sample/Sample.xoo
diff --git a/tests/perf/projects/xoo-sample/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/performance/xoo-sample/src/main/xoo/sample/Sample.xoo.measures
index 415567363b0..415567363b0 100644
--- a/tests/perf/projects/xoo-sample/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/performance/xoo-sample/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/shared/xoo-sample-with-tests/src/test/xoo/sample/SampleTest.xoo b/tests/projects/performance/xoo-sample/src/test/xoo/sample/SampleTest.xoo
index 1392fc64ebf..1392fc64ebf 100644
--- a/it/it-projects/shared/xoo-sample-with-tests/src/test/xoo/sample/SampleTest.xoo
+++ b/tests/projects/performance/xoo-sample/src/test/xoo/sample/SampleTest.xoo
diff --git a/tests/perf/projects/xoo-sample/src/test/xoo/sample/SampleTest.xoo.measures b/tests/projects/performance/xoo-sample/src/test/xoo/sample/SampleTest.xoo.measures
index b924b6953f3..b924b6953f3 100644
--- a/tests/perf/projects/xoo-sample/src/test/xoo/sample/SampleTest.xoo.measures
+++ b/tests/projects/performance/xoo-sample/src/test/xoo/sample/SampleTest.xoo.measures
diff --git a/it/it-projects/plugins/project/.gitignore b/tests/projects/plugins/project/.gitignore
index 0d70cc697f5..0d70cc697f5 100644
--- a/it/it-projects/plugins/project/.gitignore
+++ b/tests/projects/plugins/project/.gitignore
diff --git a/it/it-projects/plugins/project/build.sh b/tests/projects/plugins/project/build.sh
index 4d8d7b14856..4d8d7b14856 100644
--- a/it/it-projects/plugins/project/build.sh
+++ b/tests/projects/plugins/project/build.sh
diff --git a/it/it-projects/plugins/project/ext/cobol/copybooks/Attr.cpy b/tests/projects/plugins/project/ext/cobol/copybooks/Attr.cpy
index bc84af0bc87..bc84af0bc87 100755
--- a/it/it-projects/plugins/project/ext/cobol/copybooks/Attr.cpy
+++ b/tests/projects/plugins/project/ext/cobol/copybooks/Attr.cpy
diff --git a/it/it-projects/plugins/project/ext/cobol/copybooks/Custmas.cpy b/tests/projects/plugins/project/ext/cobol/copybooks/Custmas.cpy
index e0b41ae39d5..e0b41ae39d5 100755
--- a/it/it-projects/plugins/project/ext/cobol/copybooks/Custmas.cpy
+++ b/tests/projects/plugins/project/ext/cobol/copybooks/Custmas.cpy
diff --git a/it/it-projects/plugins/project/ext/cobol/copybooks/Errparm.cpy b/tests/projects/plugins/project/ext/cobol/copybooks/Errparm.cpy
index 3324a1b78a6..3324a1b78a6 100755
--- a/it/it-projects/plugins/project/ext/cobol/copybooks/Errparm.cpy
+++ b/tests/projects/plugins/project/ext/cobol/copybooks/Errparm.cpy
diff --git a/it/it-projects/plugins/project/ext/cobol/copybooks/MNTSET2.CPY b/tests/projects/plugins/project/ext/cobol/copybooks/MNTSET2.CPY
index b9e18823838..b9e18823838 100755
--- a/it/it-projects/plugins/project/ext/cobol/copybooks/MNTSET2.CPY
+++ b/tests/projects/plugins/project/ext/cobol/copybooks/MNTSET2.CPY
diff --git a/it/it-projects/plugins/project/lib/c/mylib.h b/tests/projects/plugins/project/lib/c/mylib.h
index 63e375d712b..63e375d712b 100644
--- a/it/it-projects/plugins/project/lib/c/mylib.h
+++ b/tests/projects/plugins/project/lib/c/mylib.h
diff --git a/it/it-projects/plugins/project/pom.xml b/tests/projects/plugins/project/pom.xml
index 41a46c9508a..41a46c9508a 100644
--- a/it/it-projects/plugins/project/pom.xml
+++ b/tests/projects/plugins/project/pom.xml
diff --git a/it/it-projects/plugins/project/sonar-project.properties b/tests/projects/plugins/project/sonar-project.properties
index a0f986a7b67..a0f986a7b67 100644
--- a/it/it-projects/plugins/project/sonar-project.properties
+++ b/tests/projects/plugins/project/sonar-project.properties
diff --git a/it/it-projects/plugins/project/src/abap/ZBCMKZ17.abap b/tests/projects/plugins/project/src/abap/ZBCMKZ17.abap
index 936119df612..936119df612 100644
--- a/it/it-projects/plugins/project/src/abap/ZBCMKZ17.abap
+++ b/tests/projects/plugins/project/src/abap/ZBCMKZ17.abap
diff --git a/it/it-projects/plugins/project/src/abap/ZZBGS106.abap b/tests/projects/plugins/project/src/abap/ZZBGS106.abap
index f0e75a11934..f0e75a11934 100644
--- a/it/it-projects/plugins/project/src/abap/ZZBGS106.abap
+++ b/tests/projects/plugins/project/src/abap/ZZBGS106.abap
diff --git a/it/it-projects/plugins/project/src/c/main.c b/tests/projects/plugins/project/src/c/main.c
index 2c3bf69a583..2c3bf69a583 100644
--- a/it/it-projects/plugins/project/src/c/main.c
+++ b/tests/projects/plugins/project/src/c/main.c
diff --git a/it/it-projects/plugins/project/src/cobol/Custmnt2.cbl b/tests/projects/plugins/project/src/cobol/Custmnt2.cbl
index 662b5ca706f..662b5ca706f 100755
--- a/it/it-projects/plugins/project/src/cobol/Custmnt2.cbl
+++ b/tests/projects/plugins/project/src/cobol/Custmnt2.cbl
diff --git a/it/it-projects/plugins/project/src/cobol/TC4E3H0.CBL b/tests/projects/plugins/project/src/cobol/TC4E3H0.CBL
index da86bbe241d..da86bbe241d 100644
--- a/it/it-projects/plugins/project/src/cobol/TC4E3H0.CBL
+++ b/tests/projects/plugins/project/src/cobol/TC4E3H0.CBL
diff --git a/it/it-projects/plugins/project/src/cpp/BiggestUnInt.cc b/tests/projects/plugins/project/src/cpp/BiggestUnInt.cc
index 3cd1acff87b..3cd1acff87b 100644
--- a/it/it-projects/plugins/project/src/cpp/BiggestUnInt.cc
+++ b/tests/projects/plugins/project/src/cpp/BiggestUnInt.cc
diff --git a/it/it-projects/plugins/project/src/cpp/HelloWorld.cpp b/tests/projects/plugins/project/src/cpp/HelloWorld.cpp
index 1d6ac1c64e8..1d6ac1c64e8 100644
--- a/it/it-projects/plugins/project/src/cpp/HelloWorld.cpp
+++ b/tests/projects/plugins/project/src/cpp/HelloWorld.cpp
diff --git a/it/it-projects/plugins/project/src/cpp/RandDemo.cc b/tests/projects/plugins/project/src/cpp/RandDemo.cc
index 1f775a04e76..1f775a04e76 100644
--- a/it/it-projects/plugins/project/src/cpp/RandDemo.cc
+++ b/tests/projects/plugins/project/src/cpp/RandDemo.cc
diff --git a/it/it-projects/plugins/project/src/cpp/SimpleClass.cc b/tests/projects/plugins/project/src/cpp/SimpleClass.cc
index 4f4ceba3aae..4f4ceba3aae 100644
--- a/it/it-projects/plugins/project/src/cpp/SimpleClass.cc
+++ b/tests/projects/plugins/project/src/cpp/SimpleClass.cc
diff --git a/it/it-projects/plugins/project/src/cpp/main.c b/tests/projects/plugins/project/src/cpp/main.c
index 05a68cccd30..05a68cccd30 100644
--- a/it/it-projects/plugins/project/src/cpp/main.c
+++ b/tests/projects/plugins/project/src/cpp/main.c
diff --git a/it/it-projects/plugins/project/src/css/sample.css b/tests/projects/plugins/project/src/css/sample.css
index 88a2ce9fdb4..88a2ce9fdb4 100644
--- a/it/it-projects/plugins/project/src/css/sample.css
+++ b/tests/projects/plugins/project/src/css/sample.css
diff --git a/it/it-projects/plugins/project/src/flex/Circle.as b/tests/projects/plugins/project/src/flex/Circle.as
index 29ebe94393f..29ebe94393f 100644
--- a/it/it-projects/plugins/project/src/flex/Circle.as
+++ b/tests/projects/plugins/project/src/flex/Circle.as
diff --git a/it/it-projects/plugins/project/src/flex/HasIssues.as b/tests/projects/plugins/project/src/flex/HasIssues.as
index 410b52709b4..410b52709b4 100644
--- a/it/it-projects/plugins/project/src/flex/HasIssues.as
+++ b/tests/projects/plugins/project/src/flex/HasIssues.as
diff --git a/it/it-projects/plugins/project/src/flex/UncoveredCircle.as b/tests/projects/plugins/project/src/flex/UncoveredCircle.as
index e0a6650345b..e0a6650345b 100644
--- a/it/it-projects/plugins/project/src/flex/UncoveredCircle.as
+++ b/tests/projects/plugins/project/src/flex/UncoveredCircle.as
diff --git a/it/it-projects/plugins/project/src/groovy/example/Greeting.groovy b/tests/projects/plugins/project/src/groovy/example/Greeting.groovy
index ef635498267..ef635498267 100644
--- a/it/it-projects/plugins/project/src/groovy/example/Greeting.groovy
+++ b/tests/projects/plugins/project/src/groovy/example/Greeting.groovy
diff --git a/it/it-projects/plugins/project/src/groovy/innerclass/InnerClassExample.groovy b/tests/projects/plugins/project/src/groovy/innerclass/InnerClassExample.groovy
index caf298d205c..caf298d205c 100644
--- a/it/it-projects/plugins/project/src/groovy/innerclass/InnerClassExample.groovy
+++ b/tests/projects/plugins/project/src/groovy/innerclass/InnerClassExample.groovy
diff --git a/it/it-projects/plugins/project/src/java/foo/Foo.java b/tests/projects/plugins/project/src/java/foo/Foo.java
index 20bf396881c..20bf396881c 100644
--- a/it/it-projects/plugins/project/src/java/foo/Foo.java
+++ b/tests/projects/plugins/project/src/java/foo/Foo.java
diff --git a/it/it-projects/plugins/project/src/java/foo/Simplest.java b/tests/projects/plugins/project/src/java/foo/Simplest.java
index 981db6738c3..981db6738c3 100644
--- a/it/it-projects/plugins/project/src/java/foo/Simplest.java
+++ b/tests/projects/plugins/project/src/java/foo/Simplest.java
diff --git a/it/it-projects/plugins/project/src/java/foo/Simplest2.java b/tests/projects/plugins/project/src/java/foo/Simplest2.java
index 2d673e178bc..2d673e178bc 100644
--- a/it/it-projects/plugins/project/src/java/foo/Simplest2.java
+++ b/tests/projects/plugins/project/src/java/foo/Simplest2.java
diff --git a/it/it-projects/plugins/project/src/java/foo/Simplest3.java b/tests/projects/plugins/project/src/java/foo/Simplest3.java
index 530fe4c4284..530fe4c4284 100644
--- a/it/it-projects/plugins/project/src/java/foo/Simplest3.java
+++ b/tests/projects/plugins/project/src/java/foo/Simplest3.java
diff --git a/it/it-projects/plugins/project/src/js/HasIssues.js b/tests/projects/plugins/project/src/js/HasIssues.js
index 8426dcf168c..8426dcf168c 100644
--- a/it/it-projects/plugins/project/src/js/HasIssues.js
+++ b/tests/projects/plugins/project/src/js/HasIssues.js
diff --git a/it/it-projects/plugins/project/src/js/Person.js b/tests/projects/plugins/project/src/js/Person.js
index f536a4f4c5e..f536a4f4c5e 100644
--- a/it/it-projects/plugins/project/src/js/Person.js
+++ b/tests/projects/plugins/project/src/js/Person.js
diff --git a/it/it-projects/plugins/project/src/js/com/company/Car.js b/tests/projects/plugins/project/src/js/com/company/Car.js
index 40a9da7898c..40a9da7898c 100644
--- a/it/it-projects/plugins/project/src/js/com/company/Car.js
+++ b/tests/projects/plugins/project/src/js/com/company/Car.js
diff --git a/it/it-projects/plugins/project/src/js/com/company/Truck.js b/tests/projects/plugins/project/src/js/com/company/Truck.js
index 98df0732527..98df0732527 100644
--- a/it/it-projects/plugins/project/src/js/com/company/Truck.js
+++ b/tests/projects/plugins/project/src/js/com/company/Truck.js
diff --git a/it/it-projects/plugins/project/src/js/com/company/Vehicle.js b/tests/projects/plugins/project/src/js/com/company/Vehicle.js
index e004a007b6c..e004a007b6c 100644
--- a/it/it-projects/plugins/project/src/js/com/company/Vehicle.js
+++ b/tests/projects/plugins/project/src/js/com/company/Vehicle.js
diff --git a/it/it-projects/plugins/project/src/php/Math.php b/tests/projects/plugins/project/src/php/Math.php
index 5c1ab480233..5c1ab480233 100644
--- a/it/it-projects/plugins/project/src/php/Math.php
+++ b/tests/projects/plugins/project/src/php/Math.php
diff --git a/it/it-projects/plugins/project/src/pli/center.pli b/tests/projects/plugins/project/src/pli/center.pli
index d6d79e5bebd..d6d79e5bebd 100644
--- a/it/it-projects/plugins/project/src/pli/center.pli
+++ b/tests/projects/plugins/project/src/pli/center.pli
diff --git a/it/it-projects/plugins/project/src/pli/chess.pli b/tests/projects/plugins/project/src/pli/chess.pli
index f1e9c1aaed8..f1e9c1aaed8 100644
--- a/it/it-projects/plugins/project/src/pli/chess.pli
+++ b/tests/projects/plugins/project/src/pli/chess.pli
diff --git a/it/it-projects/plugins/project/src/pli/hasissues.pli b/tests/projects/plugins/project/src/pli/hasissues.pli
index eaacb6c917c..eaacb6c917c 100644
--- a/it/it-projects/plugins/project/src/pli/hasissues.pli
+++ b/tests/projects/plugins/project/src/pli/hasissues.pli
diff --git a/it/it-projects/plugins/project/src/pli/maxlen.pli b/tests/projects/plugins/project/src/pli/maxlen.pli
index c7498b0936b..c7498b0936b 100644
--- a/it/it-projects/plugins/project/src/pli/maxlen.pli
+++ b/tests/projects/plugins/project/src/pli/maxlen.pli
diff --git a/it/it-projects/plugins/project/src/pli/search.pli b/tests/projects/plugins/project/src/pli/search.pli
index ed9a231427d..ed9a231427d 100644
--- a/it/it-projects/plugins/project/src/pli/search.pli
+++ b/tests/projects/plugins/project/src/pli/search.pli
diff --git a/it/it-projects/plugins/project/src/plsql/ddl.sql b/tests/projects/plugins/project/src/plsql/ddl.sql
index 78a3ddd1951..78a3ddd1951 100644
--- a/it/it-projects/plugins/project/src/plsql/ddl.sql
+++ b/tests/projects/plugins/project/src/plsql/ddl.sql
diff --git a/it/it-projects/plugins/project/src/plsql/ut_report.pkb b/tests/projects/plugins/project/src/plsql/ut_report.pkb
index 15bdc4e4f66..15bdc4e4f66 100644
--- a/it/it-projects/plugins/project/src/plsql/ut_report.pkb
+++ b/tests/projects/plugins/project/src/plsql/ut_report.pkb
diff --git a/it/it-projects/plugins/project/src/python/__init__.py b/tests/projects/plugins/project/src/python/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/it/it-projects/plugins/project/src/python/__init__.py
+++ b/tests/projects/plugins/project/src/python/__init__.py
diff --git a/it/it-projects/plugins/project/src/python/badfortune.py b/tests/projects/plugins/project/src/python/badfortune.py
index b0900dc1695..b0900dc1695 100644
--- a/it/it-projects/plugins/project/src/python/badfortune.py
+++ b/tests/projects/plugins/project/src/python/badfortune.py
diff --git a/it/it-projects/plugins/project/src/python/directory/file_in_directory.py b/tests/projects/plugins/project/src/python/directory/file_in_directory.py
index 0708437a71f..0708437a71f 100644
--- a/it/it-projects/plugins/project/src/python/directory/file_in_directory.py
+++ b/tests/projects/plugins/project/src/python/directory/file_in_directory.py
diff --git a/it/it-projects/plugins/project/src/python/hasissues.py b/tests/projects/plugins/project/src/python/hasissues.py
index df209065464..df209065464 100644
--- a/it/it-projects/plugins/project/src/python/hasissues.py
+++ b/tests/projects/plugins/project/src/python/hasissues.py
diff --git a/it/it-projects/plugins/project/src/python/package/__init__.py b/tests/projects/plugins/project/src/python/package/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/it/it-projects/plugins/project/src/python/package/__init__.py
+++ b/tests/projects/plugins/project/src/python/package/__init__.py
diff --git a/it/it-projects/plugins/project/src/python/package/file_in_package.py b/tests/projects/plugins/project/src/python/package/file_in_package.py
index fc7f2ba0752..fc7f2ba0752 100644
--- a/it/it-projects/plugins/project/src/python/package/file_in_package.py
+++ b/tests/projects/plugins/project/src/python/package/file_in_package.py
diff --git a/it/it-projects/plugins/project/src/python/samples/__init__.py b/tests/projects/plugins/project/src/python/samples/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/it/it-projects/plugins/project/src/python/samples/__init__.py
+++ b/tests/projects/plugins/project/src/python/samples/__init__.py
diff --git a/it/it-projects/plugins/project/src/python/samples/fortune.py b/tests/projects/plugins/project/src/python/samples/fortune.py
index b0900dc1695..b0900dc1695 100644
--- a/it/it-projects/plugins/project/src/python/samples/fortune.py
+++ b/tests/projects/plugins/project/src/python/samples/fortune.py
diff --git a/it/it-projects/plugins/project/src/python/samples/letters.py b/tests/projects/plugins/project/src/python/samples/letters.py
index 0f54b31c512..0f54b31c512 100644
--- a/it/it-projects/plugins/project/src/python/samples/letters.py
+++ b/tests/projects/plugins/project/src/python/samples/letters.py
diff --git a/it/it-projects/plugins/project/src/python/samples/strfile.py b/tests/projects/plugins/project/src/python/samples/strfile.py
index ca15a607c21..ca15a607c21 100644
--- a/it/it-projects/plugins/project/src/python/samples/strfile.py
+++ b/tests/projects/plugins/project/src/python/samples/strfile.py
diff --git a/it/it-projects/plugins/project/src/rpg/MYPROGRAM.rpg b/tests/projects/plugins/project/src/rpg/MYPROGRAM.rpg
index b7d36daaa02..b7d36daaa02 100644
--- a/it/it-projects/plugins/project/src/rpg/MYPROGRAM.rpg
+++ b/tests/projects/plugins/project/src/rpg/MYPROGRAM.rpg
diff --git a/it/it-projects/plugins/project/src/swift/example.swift b/tests/projects/plugins/project/src/swift/example.swift
index 194455d6b70..194455d6b70 100644
--- a/it/it-projects/plugins/project/src/swift/example.swift
+++ b/tests/projects/plugins/project/src/swift/example.swift
diff --git a/it/it-projects/plugins/project/src/vb/Info.frm b/tests/projects/plugins/project/src/vb/Info.frm
index 8487bb3af18..8487bb3af18 100644
--- a/it/it-projects/plugins/project/src/vb/Info.frm
+++ b/tests/projects/plugins/project/src/vb/Info.frm
diff --git a/it/it-projects/plugins/project/src/vb/Registry.bas b/tests/projects/plugins/project/src/vb/Registry.bas
index a7f18dee417..a7f18dee417 100644
--- a/it/it-projects/plugins/project/src/vb/Registry.bas
+++ b/tests/projects/plugins/project/src/vb/Registry.bas
diff --git a/it/it-projects/plugins/project/src/vb/Registry.cls b/tests/projects/plugins/project/src/vb/Registry.cls
index ee53025fb97..ee53025fb97 100644
--- a/it/it-projects/plugins/project/src/vb/Registry.cls
+++ b/tests/projects/plugins/project/src/vb/Registry.cls
diff --git a/it/it-projects/plugins/project/src/web/sample.xhtml b/tests/projects/plugins/project/src/web/sample.xhtml
index 45a212717b2..45a212717b2 100644
--- a/it/it-projects/plugins/project/src/web/sample.xhtml
+++ b/tests/projects/plugins/project/src/web/sample.xhtml
diff --git a/it/it-projects/plugins/project/target/classes/foo/Foo.class b/tests/projects/plugins/project/target/classes/foo/Foo.class
index 97de0cb4b2f..97de0cb4b2f 100644
--- a/it/it-projects/plugins/project/target/classes/foo/Foo.class
+++ b/tests/projects/plugins/project/target/classes/foo/Foo.class
diff --git a/it/it-projects/plugins/project/target/classes/foo/Simplest.class b/tests/projects/plugins/project/target/classes/foo/Simplest.class
index d22988c5549..d22988c5549 100644
--- a/it/it-projects/plugins/project/target/classes/foo/Simplest.class
+++ b/tests/projects/plugins/project/target/classes/foo/Simplest.class
diff --git a/it/it-projects/plugins/project/target/classes/foo/Simplest2.class b/tests/projects/plugins/project/target/classes/foo/Simplest2.class
index 62c50cd0da0..62c50cd0da0 100644
--- a/it/it-projects/plugins/project/target/classes/foo/Simplest2.class
+++ b/tests/projects/plugins/project/target/classes/foo/Simplest2.class
diff --git a/it/it-projects/plugins/project/target/classes/foo/Simplest3.class b/tests/projects/plugins/project/target/classes/foo/Simplest3.class
index e6df2a8f278..e6df2a8f278 100644
--- a/it/it-projects/plugins/project/target/classes/foo/Simplest3.class
+++ b/tests/projects/plugins/project/target/classes/foo/Simplest3.class
diff --git a/it/it-projects/plugins/project/target/it-all-lang-1.0-SNAPSHOT.jar b/tests/projects/plugins/project/target/it-all-lang-1.0-SNAPSHOT.jar
index f50c4a3d1bd..f50c4a3d1bd 100644
--- a/it/it-projects/plugins/project/target/it-all-lang-1.0-SNAPSHOT.jar
+++ b/tests/projects/plugins/project/target/it-all-lang-1.0-SNAPSHOT.jar
diff --git a/it/it-projects/plugins/project/target/js/lcov.dat b/tests/projects/plugins/project/target/js/lcov.dat
index dc51a1c762b..dc51a1c762b 100644
--- a/it/it-projects/plugins/project/target/js/lcov.dat
+++ b/tests/projects/plugins/project/target/js/lcov.dat
diff --git a/it/it-projects/plugins/project/target/php/phpunit.coverage.xml b/tests/projects/plugins/project/target/php/phpunit.coverage.xml
index 184a0dd8466..184a0dd8466 100644
--- a/it/it-projects/plugins/project/target/php/phpunit.coverage.xml
+++ b/tests/projects/plugins/project/target/php/phpunit.coverage.xml
diff --git a/it/it-projects/plugins/project/target/php/phpunit.xml b/tests/projects/plugins/project/target/php/phpunit.xml
index 1942bdf47d6..1942bdf47d6 100644
--- a/it/it-projects/plugins/project/target/php/phpunit.xml
+++ b/tests/projects/plugins/project/target/php/phpunit.xml
diff --git a/it/it-projects/plugins/project/target/surefire-reports/TEST-foo.FooTest.xml b/tests/projects/plugins/project/target/surefire-reports/TEST-foo.FooTest.xml
index 74695fdea1e..74695fdea1e 100644
--- a/it/it-projects/plugins/project/target/surefire-reports/TEST-foo.FooTest.xml
+++ b/tests/projects/plugins/project/target/surefire-reports/TEST-foo.FooTest.xml
diff --git a/it/it-projects/plugins/project/target/surefire-reports/TEST-foo.SimplestTest.xml b/tests/projects/plugins/project/target/surefire-reports/TEST-foo.SimplestTest.xml
index 3023499428f..3023499428f 100644
--- a/it/it-projects/plugins/project/target/surefire-reports/TEST-foo.SimplestTest.xml
+++ b/tests/projects/plugins/project/target/surefire-reports/TEST-foo.SimplestTest.xml
diff --git a/it/it-projects/plugins/project/target/surefire-reports/foo.FooTest.txt b/tests/projects/plugins/project/target/surefire-reports/foo.FooTest.txt
index 81a35910169..81a35910169 100644
--- a/it/it-projects/plugins/project/target/surefire-reports/foo.FooTest.txt
+++ b/tests/projects/plugins/project/target/surefire-reports/foo.FooTest.txt
diff --git a/it/it-projects/plugins/project/target/surefire-reports/foo.SimplestTest.txt b/tests/projects/plugins/project/target/surefire-reports/foo.SimplestTest.txt
index 1e8766a397f..1e8766a397f 100644
--- a/it/it-projects/plugins/project/target/surefire-reports/foo.SimplestTest.txt
+++ b/tests/projects/plugins/project/target/surefire-reports/foo.SimplestTest.txt
diff --git a/it/it-projects/plugins/project/target/test-classes/foo/FooTest.class b/tests/projects/plugins/project/target/test-classes/foo/FooTest.class
index 0970a8681a7..0970a8681a7 100644
--- a/it/it-projects/plugins/project/target/test-classes/foo/FooTest.class
+++ b/tests/projects/plugins/project/target/test-classes/foo/FooTest.class
diff --git a/it/it-projects/plugins/project/target/test-classes/foo/SimplestTest.class b/tests/projects/plugins/project/target/test-classes/foo/SimplestTest.class
index 3f6daea7c54..3f6daea7c54 100644
--- a/it/it-projects/plugins/project/target/test-classes/foo/SimplestTest.class
+++ b/tests/projects/plugins/project/target/test-classes/foo/SimplestTest.class
diff --git a/it/it-projects/plugins/project/test/java/foo/FooTest.java b/tests/projects/plugins/project/test/java/foo/FooTest.java
index d0eb283e151..d0eb283e151 100644
--- a/it/it-projects/plugins/project/test/java/foo/FooTest.java
+++ b/tests/projects/plugins/project/test/java/foo/FooTest.java
diff --git a/it/it-projects/plugins/project/test/java/foo/SimplestTest.java b/tests/projects/plugins/project/test/java/foo/SimplestTest.java
index 8c28ff4c91e..8c28ff4c91e 100644
--- a/it/it-projects/plugins/project/test/java/foo/SimplestTest.java
+++ b/tests/projects/plugins/project/test/java/foo/SimplestTest.java
diff --git a/it/it-projects/plugins/project/test/js/PersonTest.js b/tests/projects/plugins/project/test/js/PersonTest.js
index 36b8fb05af5..36b8fb05af5 100644
--- a/it/it-projects/plugins/project/test/js/PersonTest.js
+++ b/tests/projects/plugins/project/test/js/PersonTest.js
diff --git a/it/it-projects/plugins/project/test/js/com/company/CarTest.js b/tests/projects/plugins/project/test/js/com/company/CarTest.js
index b63b17d1f69..b63b17d1f69 100644
--- a/it/it-projects/plugins/project/test/js/com/company/CarTest.js
+++ b/tests/projects/plugins/project/test/js/com/company/CarTest.js
diff --git a/it/it-projects/plugins/project/test/php/SomeTest.php b/tests/projects/plugins/project/test/php/SomeTest.php
index 5f8b96d2160..5f8b96d2160 100644
--- a/it/it-projects/plugins/project/test/php/SomeTest.php
+++ b/tests/projects/plugins/project/test/php/SomeTest.php
diff --git a/it/it-projects/projectSearch/xoo-history-v1/sonar-project.properties b/tests/projects/projectSearch/xoo-history-v1/sonar-project.properties
index ede32ccb043..ede32ccb043 100644
--- a/it/it-projects/projectSearch/xoo-history-v1/sonar-project.properties
+++ b/tests/projects/projectSearch/xoo-history-v1/sonar-project.properties
diff --git a/it/it-projects/projectSearch/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo b/tests/projects/projectSearch/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo
index 2b0288fc971..2b0288fc971 100644
--- a/it/it-projects/projectSearch/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo
+++ b/tests/projects/projectSearch/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo
diff --git a/it/it-projects/projectSearch/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo.measures b/tests/projects/projectSearch/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo.measures
index 0861ac725c3..0861ac725c3 100644
--- a/it/it-projects/projectSearch/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo.measures
+++ b/tests/projects/projectSearch/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo.measures
diff --git a/it/it-projects/projectSearch/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo b/tests/projects/projectSearch/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo
index 2b0288fc971..2b0288fc971 100644
--- a/it/it-projects/projectSearch/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo
+++ b/tests/projects/projectSearch/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo
diff --git a/it/it-projects/projectSearch/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo.measures b/tests/projects/projectSearch/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo.measures
index 0861ac725c3..0861ac725c3 100644
--- a/it/it-projects/projectSearch/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo.measures
+++ b/tests/projects/projectSearch/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo.measures
diff --git a/it/it-projects/projectSearch/xoo-history-v2/sonar-project.properties b/tests/projects/projectSearch/xoo-history-v2/sonar-project.properties
index 42a4d832540..42a4d832540 100644
--- a/it/it-projects/projectSearch/xoo-history-v2/sonar-project.properties
+++ b/tests/projects/projectSearch/xoo-history-v2/sonar-project.properties
diff --git a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
index b0fd1087030..b0fd1087030 100644
--- a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
+++ b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
diff --git a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
index 0861ac725c3..0861ac725c3 100644
--- a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
+++ b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
diff --git a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.scm b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.scm
index 63fb4b3888e..63fb4b3888e 100644
--- a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.scm
+++ b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.scm
diff --git a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
index 393111bbab0..393111bbab0 100644
--- a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
+++ b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
diff --git a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
index 5de11af72ed..5de11af72ed 100644
--- a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
+++ b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
diff --git a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.scm b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.scm
index 7d71523dcf4..7d71523dcf4 100644
--- a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.scm
+++ b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.scm
diff --git a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
index 2b0288fc971..2b0288fc971 100644
--- a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
+++ b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
diff --git a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
index 0861ac725c3..0861ac725c3 100644
--- a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
+++ b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
diff --git a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.scm b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.scm
index 72dc2d569bf..72dc2d569bf 100644
--- a/it/it-projects/projectSearch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.scm
+++ b/tests/projects/projectSearch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.scm
diff --git a/it/it-projects/qualitygate/xoo-sample/sonar-project.properties b/tests/projects/qualitygate/xoo-sample/sonar-project.properties
index 8819d09dd60..8819d09dd60 100644
--- a/it/it-projects/qualitygate/xoo-sample/sonar-project.properties
+++ b/tests/projects/qualitygate/xoo-sample/sonar-project.properties
diff --git a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/main/xoo/sample/Sample.xoo b/tests/projects/qualitygate/xoo-sample/src/sample/Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/qualitygate/xoo-sample/src/sample/Sample.xoo
diff --git a/it/it-projects/qualitygate/xoo-sample/src/sample/Sample.xoo.measures b/tests/projects/qualitygate/xoo-sample/src/sample/Sample.xoo.measures
index f67312c1004..f67312c1004 100644
--- a/it/it-projects/qualitygate/xoo-sample/src/sample/Sample.xoo.measures
+++ b/tests/projects/qualitygate/xoo-sample/src/sample/Sample.xoo.measures
diff --git a/it/it-projects/qualitygate/xoo-sample/src/sample/Sample2.xoo b/tests/projects/qualitygate/xoo-sample/src/sample/Sample2.xoo
index 6c1b6459c34..6c1b6459c34 100644
--- a/it/it-projects/qualitygate/xoo-sample/src/sample/Sample2.xoo
+++ b/tests/projects/qualitygate/xoo-sample/src/sample/Sample2.xoo
diff --git a/it/it-projects/qualitygate/xoo-sample/src/sample/Sample2.xoo.measures b/tests/projects/qualitygate/xoo-sample/src/sample/Sample2.xoo.measures
index 22e229b6ed0..22e229b6ed0 100644
--- a/it/it-projects/qualitygate/xoo-sample/src/sample/Sample2.xoo.measures
+++ b/tests/projects/qualitygate/xoo-sample/src/sample/Sample2.xoo.measures
diff --git a/it/it-projects/scm/xoo-sample-with-scm/sonar-project.properties b/tests/projects/scm/xoo-sample-with-scm/sonar-project.properties
index 73645df942f..73645df942f 100644
--- a/it/it-projects/scm/xoo-sample-with-scm/sonar-project.properties
+++ b/tests/projects/scm/xoo-sample-with-scm/sonar-project.properties
diff --git a/it/it-projects/scm/xoo-sample-with-scm/src/main/xoo/sample/Sample.xoo b/tests/projects/scm/xoo-sample-with-scm/src/main/xoo/sample/Sample.xoo
index 9dc354b8608..9dc354b8608 100644
--- a/it/it-projects/scm/xoo-sample-with-scm/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/scm/xoo-sample-with-scm/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/scm/xoo-sample-with-scm/src/main/xoo/sample/Sample.xoo.scm b/tests/projects/scm/xoo-sample-with-scm/src/main/xoo/sample/Sample.xoo.scm
index 6db3ba66128..6db3ba66128 100644
--- a/it/it-projects/scm/xoo-sample-with-scm/src/main/xoo/sample/Sample.xoo.scm
+++ b/tests/projects/scm/xoo-sample-with-scm/src/main/xoo/sample/Sample.xoo.scm
diff --git a/it/it-projects/shared/multi-modules-sample/module_a/module_a1/pom.xml b/tests/projects/shared/multi-modules-sample/module_a/module_a1/pom.xml
index b514c6ee0c7..b514c6ee0c7 100644
--- a/it/it-projects/shared/multi-modules-sample/module_a/module_a1/pom.xml
+++ b/tests/projects/shared/multi-modules-sample/module_a/module_a1/pom.xml
diff --git a/it/it-projects/shared/multi-modules-sample/module_a/module_a1/src/main/java/com/sonar/it/samples/modules/a1/HelloA1.java b/tests/projects/shared/multi-modules-sample/module_a/module_a1/src/main/java/com/sonar/it/samples/modules/a1/HelloA1.java
index 7471eaf64a9..7471eaf64a9 100644
--- a/it/it-projects/shared/multi-modules-sample/module_a/module_a1/src/main/java/com/sonar/it/samples/modules/a1/HelloA1.java
+++ b/tests/projects/shared/multi-modules-sample/module_a/module_a1/src/main/java/com/sonar/it/samples/modules/a1/HelloA1.java
diff --git a/it/it-projects/shared/multi-modules-sample/module_a/module_a2/pom.xml b/tests/projects/shared/multi-modules-sample/module_a/module_a2/pom.xml
index c9bc3ce46db..c9bc3ce46db 100644
--- a/it/it-projects/shared/multi-modules-sample/module_a/module_a2/pom.xml
+++ b/tests/projects/shared/multi-modules-sample/module_a/module_a2/pom.xml
diff --git a/it/it-projects/shared/multi-modules-sample/module_a/module_a2/src/main/java/com/sonar/it/samples/modules/a2/HelloA2.java b/tests/projects/shared/multi-modules-sample/module_a/module_a2/src/main/java/com/sonar/it/samples/modules/a2/HelloA2.java
index 3d767d9500a..3d767d9500a 100644
--- a/it/it-projects/shared/multi-modules-sample/module_a/module_a2/src/main/java/com/sonar/it/samples/modules/a2/HelloA2.java
+++ b/tests/projects/shared/multi-modules-sample/module_a/module_a2/src/main/java/com/sonar/it/samples/modules/a2/HelloA2.java
diff --git a/it/it-projects/shared/multi-modules-sample/module_a/pom.xml b/tests/projects/shared/multi-modules-sample/module_a/pom.xml
index 793fbcf8420..793fbcf8420 100644
--- a/it/it-projects/shared/multi-modules-sample/module_a/pom.xml
+++ b/tests/projects/shared/multi-modules-sample/module_a/pom.xml
diff --git a/it/it-projects/shared/multi-modules-sample/module_b/module_b1/pom.xml b/tests/projects/shared/multi-modules-sample/module_b/module_b1/pom.xml
index dc2cc52447f..dc2cc52447f 100644
--- a/it/it-projects/shared/multi-modules-sample/module_b/module_b1/pom.xml
+++ b/tests/projects/shared/multi-modules-sample/module_b/module_b1/pom.xml
diff --git a/it/it-projects/shared/multi-modules-sample/module_b/module_b1/src/main/java/com/sonar/it/samples/modules/b1/HelloB1.java b/tests/projects/shared/multi-modules-sample/module_b/module_b1/src/main/java/com/sonar/it/samples/modules/b1/HelloB1.java
index b83c3af128c..b83c3af128c 100644
--- a/it/it-projects/shared/multi-modules-sample/module_b/module_b1/src/main/java/com/sonar/it/samples/modules/b1/HelloB1.java
+++ b/tests/projects/shared/multi-modules-sample/module_b/module_b1/src/main/java/com/sonar/it/samples/modules/b1/HelloB1.java
diff --git a/it/it-projects/shared/multi-modules-sample/module_b/module_b2/pom.xml b/tests/projects/shared/multi-modules-sample/module_b/module_b2/pom.xml
index 9ed7337e659..9ed7337e659 100644
--- a/it/it-projects/shared/multi-modules-sample/module_b/module_b2/pom.xml
+++ b/tests/projects/shared/multi-modules-sample/module_b/module_b2/pom.xml
diff --git a/it/it-projects/shared/multi-modules-sample/module_b/module_b2/src/main/java/com/sonar/it/samples/modules/b2/HelloB2.java b/tests/projects/shared/multi-modules-sample/module_b/module_b2/src/main/java/com/sonar/it/samples/modules/b2/HelloB2.java
index 20b8bb3876a..20b8bb3876a 100644
--- a/it/it-projects/shared/multi-modules-sample/module_b/module_b2/src/main/java/com/sonar/it/samples/modules/b2/HelloB2.java
+++ b/tests/projects/shared/multi-modules-sample/module_b/module_b2/src/main/java/com/sonar/it/samples/modules/b2/HelloB2.java
diff --git a/it/it-projects/shared/multi-modules-sample/module_b/pom.xml b/tests/projects/shared/multi-modules-sample/module_b/pom.xml
index 2259da3ef66..2259da3ef66 100644
--- a/it/it-projects/shared/multi-modules-sample/module_b/pom.xml
+++ b/tests/projects/shared/multi-modules-sample/module_b/pom.xml
diff --git a/it/it-projects/shared/multi-modules-sample/pom.xml b/tests/projects/shared/multi-modules-sample/pom.xml
index 21db9df608a..21db9df608a 100644
--- a/it/it-projects/shared/multi-modules-sample/pom.xml
+++ b/tests/projects/shared/multi-modules-sample/pom.xml
diff --git a/it/it-projects/shared/multi-modules-sample/sonar-project.properties b/tests/projects/shared/multi-modules-sample/sonar-project.properties
index 9e2528c95b9..9e2528c95b9 100644
--- a/it/it-projects/shared/multi-modules-sample/sonar-project.properties
+++ b/tests/projects/shared/multi-modules-sample/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-history-v1/sonar-project.properties b/tests/projects/shared/xoo-history-v1/sonar-project.properties
index ede32ccb043..ede32ccb043 100644
--- a/it/it-projects/shared/xoo-history-v1/sonar-project.properties
+++ b/tests/projects/shared/xoo-history-v1/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo b/tests/projects/shared/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo
index 2b0288fc971..2b0288fc971 100644
--- a/it/it-projects/shared/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo
+++ b/tests/projects/shared/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo
diff --git a/it/it-projects/shared/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo.measures b/tests/projects/shared/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo.measures
index 0861ac725c3..0861ac725c3 100644
--- a/it/it-projects/shared/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo.measures
+++ b/tests/projects/shared/xoo-history-v1/src/main/xoo/sample/ClassToModify.xoo.measures
diff --git a/it/it-projects/shared/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo b/tests/projects/shared/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo
index 2b0288fc971..2b0288fc971 100644
--- a/it/it-projects/shared/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo
+++ b/tests/projects/shared/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo
diff --git a/it/it-projects/shared/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo.measures b/tests/projects/shared/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo.measures
index 0861ac725c3..0861ac725c3 100644
--- a/it/it-projects/shared/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo.measures
+++ b/tests/projects/shared/xoo-history-v1/src/main/xoo/sample/UnchangedClass.xoo.measures
diff --git a/it/it-projects/shared/xoo-history-v2/sonar-project.properties b/tests/projects/shared/xoo-history-v2/sonar-project.properties
index e01f062e51b..e01f062e51b 100644
--- a/it/it-projects/shared/xoo-history-v2/sonar-project.properties
+++ b/tests/projects/shared/xoo-history-v2/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo b/tests/projects/shared/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
index b0fd1087030..b0fd1087030 100644
--- a/it/it-projects/shared/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
+++ b/tests/projects/shared/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
diff --git a/it/it-projects/shared/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures b/tests/projects/shared/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
index 0861ac725c3..0861ac725c3 100644
--- a/it/it-projects/shared/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
+++ b/tests/projects/shared/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
diff --git a/it/it-projects/shared/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo b/tests/projects/shared/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
index 393111bbab0..393111bbab0 100644
--- a/it/it-projects/shared/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
+++ b/tests/projects/shared/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
diff --git a/it/it-projects/shared/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures b/tests/projects/shared/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
index 5de11af72ed..5de11af72ed 100644
--- a/it/it-projects/shared/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
+++ b/tests/projects/shared/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
diff --git a/it/it-projects/shared/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo b/tests/projects/shared/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
index 2b0288fc971..2b0288fc971 100644
--- a/it/it-projects/shared/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
+++ b/tests/projects/shared/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
diff --git a/it/it-projects/shared/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures b/tests/projects/shared/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
index 0861ac725c3..0861ac725c3 100644
--- a/it/it-projects/shared/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
+++ b/tests/projects/shared/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a1/sonar-project.properties b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a1/sonar-project.properties
index a081a0e6342..a081a0e6342 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a1/sonar-project.properties
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a1/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a2/sonar-project.properties b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a2/sonar-project.properties
index fcedab83843..fcedab83843 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a2/sonar-project.properties
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a2/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 796d90cfad5..796d90cfad5 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index 63df5add6d4..63df5add6d4 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/sonar-project.properties b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/sonar-project.properties
index 7e6ca9074a4..7e6ca9074a4 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/sonar-project.properties
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_a/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
index b83c3af128c..b83c3af128c 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b2/sonar-project.properties b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b2/sonar-project.properties
index e597dab4f33..e597dab4f33 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b2/sonar-project.properties
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b2/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
index 20b8bb3876a..20b8bb3876a 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/sonar-project.properties b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/sonar-project.properties
index 7bc39b44133..7bc39b44133 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/sonar-project.properties
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/module_b/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/sonar-project.properties b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/sonar-project.properties
index 074304998f5..074304998f5 100644
--- a/it/it-projects/shared/xoo-multi-module-sample-without-project-name-version/sonar-project.properties
+++ b/tests/projects/shared/xoo-multi-module-sample-without-project-name-version/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_a/module_a1/sonar-project.properties b/tests/projects/shared/xoo-multi-modules-sample/module_a/module_a1/sonar-project.properties
index a081a0e6342..a081a0e6342 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_a/module_a1/sonar-project.properties
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_a/module_a1/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/tests/projects/shared/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/tests/projects/shared/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
index f3953ccd0fe..f3953ccd0fe 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_a/module_a1/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_a/module_a2/sonar-project.properties b/tests/projects/shared/xoo-multi-modules-sample/module_a/module_a2/sonar-project.properties
index fcedab83843..fcedab83843 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_a/module_a2/sonar-project.properties
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_a/module_a2/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/tests/projects/shared/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 796d90cfad5..796d90cfad5 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/tests/projects/shared/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index a23e10d8ab4..a23e10d8ab4 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_a/module_a2/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_a/sonar-project.properties b/tests/projects/shared/xoo-multi-modules-sample/module_a/sonar-project.properties
index 7e6ca9074a4..7e6ca9074a4 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_a/sonar-project.properties
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_a/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_b/module_b1/sonar-project.properties b/tests/projects/shared/xoo-multi-modules-sample/module_b/module_b1/sonar-project.properties
index ca8404b7bd4..ca8404b7bd4 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_b/module_b1/sonar-project.properties
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_b/module_b1/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo b/tests/projects/shared/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
index b83c3af128c..b83c3af128c 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures b/tests/projects/shared/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
index f3953ccd0fe..f3953ccd0fe 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_b/module_b1/src/main/xoo/com/sonar/it/samples/modules/b1/HelloB1.xoo.measures
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_b/module_b2/sonar-project.properties b/tests/projects/shared/xoo-multi-modules-sample/module_b/module_b2/sonar-project.properties
index e597dab4f33..e597dab4f33 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_b/module_b2/sonar-project.properties
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_b/module_b2/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo b/tests/projects/shared/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
index 20b8bb3876a..20b8bb3876a 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures b/tests/projects/shared/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
index f3953ccd0fe..f3953ccd0fe 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_b/module_b2/src/main/xoo/com/sonar/it/samples/modules/b2/HelloB2.xoo.measures
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/module_b/sonar-project.properties b/tests/projects/shared/xoo-multi-modules-sample/module_b/sonar-project.properties
index 21d69f769d3..21d69f769d3 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/module_b/sonar-project.properties
+++ b/tests/projects/shared/xoo-multi-modules-sample/module_b/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-multi-modules-sample/sonar-project.properties b/tests/projects/shared/xoo-multi-modules-sample/sonar-project.properties
index 7935cb5ffb0..7935cb5ffb0 100644
--- a/it/it-projects/shared/xoo-multi-modules-sample/sonar-project.properties
+++ b/tests/projects/shared/xoo-multi-modules-sample/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-precise-issues/sonar-project.properties b/tests/projects/shared/xoo-precise-issues/sonar-project.properties
index 1a7b22bbc15..1a7b22bbc15 100644
--- a/it/it-projects/shared/xoo-precise-issues/sonar-project.properties
+++ b/tests/projects/shared/xoo-precise-issues/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-precise-issues/src/main/xoo/sample/Sample.xoo b/tests/projects/shared/xoo-precise-issues/src/main/xoo/sample/Sample.xoo
index 56ce09970af..56ce09970af 100644
--- a/it/it-projects/shared/xoo-precise-issues/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/shared/xoo-precise-issues/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/shared/xoo-sample-module-move-v1/module_a/sonar-project.properties b/tests/projects/shared/xoo-sample-module-move-v1/module_a/sonar-project.properties
index 627ee34d167..627ee34d167 100644
--- a/it/it-projects/shared/xoo-sample-module-move-v1/module_a/sonar-project.properties
+++ b/tests/projects/shared/xoo-sample-module-move-v1/module_a/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-sample-module-move-v1/module_a/src/main/xoo/sample/Sample.xoo b/tests/projects/shared/xoo-sample-module-move-v1/module_a/src/main/xoo/sample/Sample.xoo
index 41871e123a3..41871e123a3 100644
--- a/it/it-projects/shared/xoo-sample-module-move-v1/module_a/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/shared/xoo-sample-module-move-v1/module_a/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/shared/xoo-sample-module-move-v1/module_a/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/shared/xoo-sample-module-move-v1/module_a/src/main/xoo/sample/Sample.xoo.measures
index 641332a5013..641332a5013 100644
--- a/it/it-projects/shared/xoo-sample-module-move-v1/module_a/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/shared/xoo-sample-module-move-v1/module_a/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/shared/xoo-sample-module-move-v1/sonar-project.properties b/tests/projects/shared/xoo-sample-module-move-v1/sonar-project.properties
index 80a6207ca5c..80a6207ca5c 100644
--- a/it/it-projects/shared/xoo-sample-module-move-v1/sonar-project.properties
+++ b/tests/projects/shared/xoo-sample-module-move-v1/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-sample-module-move-v2/new_module/module_a/sonar-project.properties b/tests/projects/shared/xoo-sample-module-move-v2/new_module/module_a/sonar-project.properties
index 627ee34d167..627ee34d167 100644
--- a/it/it-projects/shared/xoo-sample-module-move-v2/new_module/module_a/sonar-project.properties
+++ b/tests/projects/shared/xoo-sample-module-move-v2/new_module/module_a/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-sample-module-move-v2/new_module/module_a/src/main/xoo/sample/Sample.xoo b/tests/projects/shared/xoo-sample-module-move-v2/new_module/module_a/src/main/xoo/sample/Sample.xoo
index 41871e123a3..41871e123a3 100644
--- a/it/it-projects/shared/xoo-sample-module-move-v2/new_module/module_a/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/shared/xoo-sample-module-move-v2/new_module/module_a/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/shared/xoo-sample-module-move-v2/new_module/module_a/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/shared/xoo-sample-module-move-v2/new_module/module_a/src/main/xoo/sample/Sample.xoo.measures
index 641332a5013..641332a5013 100644
--- a/it/it-projects/shared/xoo-sample-module-move-v2/new_module/module_a/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/shared/xoo-sample-module-move-v2/new_module/module_a/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/shared/xoo-sample-module-move-v2/new_module/sonar-project.properties b/tests/projects/shared/xoo-sample-module-move-v2/new_module/sonar-project.properties
index 22721e824fa..22721e824fa 100644
--- a/it/it-projects/shared/xoo-sample-module-move-v2/new_module/sonar-project.properties
+++ b/tests/projects/shared/xoo-sample-module-move-v2/new_module/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-sample-module-move-v2/sonar-project.properties b/tests/projects/shared/xoo-sample-module-move-v2/sonar-project.properties
index ce727e4ea81..ce727e4ea81 100644
--- a/it/it-projects/shared/xoo-sample-module-move-v2/sonar-project.properties
+++ b/tests/projects/shared/xoo-sample-module-move-v2/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-sample-non-associated/sonar-project.properties b/tests/projects/shared/xoo-sample-non-associated/sonar-project.properties
index 71b83e48b9f..71b83e48b9f 100644
--- a/it/it-projects/shared/xoo-sample-non-associated/sonar-project.properties
+++ b/tests/projects/shared/xoo-sample-non-associated/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-sample-non-associated/src/main/xoo/sample/Sample.xoo b/tests/projects/shared/xoo-sample-non-associated/src/main/xoo/sample/Sample.xoo
index 41871e123a3..41871e123a3 100644
--- a/it/it-projects/shared/xoo-sample-non-associated/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/shared/xoo-sample-non-associated/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/shared/xoo-sample-non-associated/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/shared/xoo-sample-non-associated/src/main/xoo/sample/Sample.xoo.measures
index 641332a5013..641332a5013 100644
--- a/it/it-projects/shared/xoo-sample-non-associated/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/shared/xoo-sample-non-associated/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/shared/xoo-sample-with-root-dir/Hello.xoo b/tests/projects/shared/xoo-sample-with-root-dir/Hello.xoo
index b83c3af128c..b83c3af128c 100644
--- a/it/it-projects/shared/xoo-sample-with-root-dir/Hello.xoo
+++ b/tests/projects/shared/xoo-sample-with-root-dir/Hello.xoo
diff --git a/it/it-projects/shared/xoo-sample-with-root-dir/sonar-project.properties b/tests/projects/shared/xoo-sample-with-root-dir/sonar-project.properties
index 35fbcff0e60..35fbcff0e60 100644
--- a/it/it-projects/shared/xoo-sample-with-root-dir/sonar-project.properties
+++ b/tests/projects/shared/xoo-sample-with-root-dir/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-sample-with-root-dir/src/main/xoo/sample/Sample.xoo b/tests/projects/shared/xoo-sample-with-root-dir/src/main/xoo/sample/Sample.xoo
index 41871e123a3..41871e123a3 100644
--- a/it/it-projects/shared/xoo-sample-with-root-dir/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/shared/xoo-sample-with-root-dir/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/shared/xoo-sample-with-root-dir/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/shared/xoo-sample-with-root-dir/src/main/xoo/sample/Sample.xoo.measures
index 641332a5013..641332a5013 100644
--- a/it/it-projects/shared/xoo-sample-with-root-dir/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/shared/xoo-sample-with-root-dir/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/shared/xoo-sample-with-tests/sonar-project.properties b/tests/projects/shared/xoo-sample-with-tests/sonar-project.properties
index 0f2415d0320..0f2415d0320 100644
--- a/it/it-projects/shared/xoo-sample-with-tests/sonar-project.properties
+++ b/tests/projects/shared/xoo-sample-with-tests/sonar-project.properties
diff --git a/it/it-projects/testing/xoo-sample-with-tests-execution-details/src/main/xoo/sample/Sample.xoo b/tests/projects/shared/xoo-sample-with-tests/src/main/xoo/sample/Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/testing/xoo-sample-with-tests-execution-details/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/shared/xoo-sample-with-tests/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/shared/xoo-sample-with-tests/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/shared/xoo-sample-with-tests/src/main/xoo/sample/Sample.xoo.measures
index c427258db4e..c427258db4e 100644
--- a/it/it-projects/shared/xoo-sample-with-tests/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/shared/xoo-sample-with-tests/src/main/xoo/sample/Sample.xoo.measures
diff --git a/tests/perf/projects/xoo-sample/src/test/xoo/sample/SampleTest.xoo b/tests/projects/shared/xoo-sample-with-tests/src/test/xoo/sample/SampleTest.xoo
index 1392fc64ebf..1392fc64ebf 100644
--- a/tests/perf/projects/xoo-sample/src/test/xoo/sample/SampleTest.xoo
+++ b/tests/projects/shared/xoo-sample-with-tests/src/test/xoo/sample/SampleTest.xoo
diff --git a/it/it-projects/shared/xoo-sample-with-tests/src/test/xoo/sample/SampleTest.xoo.measures b/tests/projects/shared/xoo-sample-with-tests/src/test/xoo/sample/SampleTest.xoo.measures
index 5a3f14e5962..5a3f14e5962 100644
--- a/it/it-projects/shared/xoo-sample-with-tests/src/test/xoo/sample/SampleTest.xoo.measures
+++ b/tests/projects/shared/xoo-sample-with-tests/src/test/xoo/sample/SampleTest.xoo.measures
diff --git a/it/it-projects/shared/xoo-sample/sonar-project.properties b/tests/projects/shared/xoo-sample/sonar-project.properties
index 9e4aa0e3584..9e4aa0e3584 100644
--- a/it/it-projects/shared/xoo-sample/sonar-project.properties
+++ b/tests/projects/shared/xoo-sample/sonar-project.properties
diff --git a/it/it-projects/shared/xoo-sample/src/main/xoo/sample/Sample.xoo b/tests/projects/shared/xoo-sample/src/main/xoo/sample/Sample.xoo
index 41871e123a3..41871e123a3 100644
--- a/it/it-projects/shared/xoo-sample/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/shared/xoo-sample/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/shared/xoo-sample/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/shared/xoo-sample/src/main/xoo/sample/Sample.xoo.measures
index 06c9b6c2f38..06c9b6c2f38 100644
--- a/it/it-projects/shared/xoo-sample/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/shared/xoo-sample/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/shared/xoo-two-letters-named/sonar-project.properties b/tests/projects/shared/xoo-two-letters-named/sonar-project.properties
index c0ebb39302f..c0ebb39302f 100644
--- a/it/it-projects/shared/xoo-two-letters-named/sonar-project.properties
+++ b/tests/projects/shared/xoo-two-letters-named/sonar-project.properties
diff --git a/it/it-projects/testing/xoo-sample-with-tests-execution-measures/src/main/xoo/sample/Sample.xoo b/tests/projects/shared/xoo-two-letters-named/src/main/xoo/sample/Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/testing/xoo-sample-with-tests-execution-measures/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/shared/xoo-two-letters-named/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/shared/xoo-two-letters-named/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/shared/xoo-two-letters-named/src/main/xoo/sample/Sample.xoo.measures
index 56acf8077d6..56acf8077d6 100644
--- a/it/it-projects/shared/xoo-two-letters-named/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/shared/xoo-two-letters-named/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/sourceCode/japanese-charset/sonar-project.properties b/tests/projects/sourceCode/japanese-charset/sonar-project.properties
index 3c21994665d..3c21994665d 100644
--- a/it/it-projects/sourceCode/japanese-charset/sonar-project.properties
+++ b/tests/projects/sourceCode/japanese-charset/sonar-project.properties
diff --git a/it/it-projects/sourceCode/japanese-charset/src/main/xoo/com/test/App.xoo b/tests/projects/sourceCode/japanese-charset/src/main/xoo/com/test/App.xoo
index 5496feccf6a..5496feccf6a 100644
--- a/it/it-projects/sourceCode/japanese-charset/src/main/xoo/com/test/App.xoo
+++ b/tests/projects/sourceCode/japanese-charset/src/main/xoo/com/test/App.xoo
diff --git a/it/it-projects/sourceCode/japanese-charset/src/main/xoo/com/test/App.xoo.measures b/tests/projects/sourceCode/japanese-charset/src/main/xoo/com/test/App.xoo.measures
index 0478fb1e30a..0478fb1e30a 100644
--- a/it/it-projects/sourceCode/japanese-charset/src/main/xoo/com/test/App.xoo.measures
+++ b/tests/projects/sourceCode/japanese-charset/src/main/xoo/com/test/App.xoo.measures
diff --git a/it/it-projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppCpdBug.xoo b/tests/projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppCpdBug.xoo
index 61a27c9aa45..61a27c9aa45 100644
--- a/it/it-projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppCpdBug.xoo
+++ b/tests/projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppCpdBug.xoo
diff --git a/it/it-projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppCpdBug.xoo.measures b/tests/projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppCpdBug.xoo.measures
index 9fd62445ebd..9fd62445ebd 100644
--- a/it/it-projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppCpdBug.xoo.measures
+++ b/tests/projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppCpdBug.xoo.measures
diff --git a/it/it-projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppDuplication.xoo b/tests/projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppDuplication.xoo
index f69e98cd252..f69e98cd252 100644
--- a/it/it-projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppDuplication.xoo
+++ b/tests/projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppDuplication.xoo
diff --git a/it/it-projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppDuplication.xoo.measures b/tests/projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppDuplication.xoo.measures
index aad53b8fe28..aad53b8fe28 100644
--- a/it/it-projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppDuplication.xoo.measures
+++ b/tests/projects/sourceCode/japanese-charset/src/main/xoo/com/test/AppDuplication.xoo.measures
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/pom.xml b/tests/projects/struts-1.3.9-diet/core/pom.xml
index 874dee330e3..874dee330e3 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/pom.xml
+++ b/tests/projects/struts-1.3.9-diet/core/pom.xml
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/Globals.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/Globals.java
index 7db9f4ca71f..7db9f4ca71f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/Globals.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/Globals.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/Action.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/Action.java
index 058d9ac81bf..058d9ac81bf 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/Action.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/Action.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionErrors.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionErrors.java
index 869dde8aaff..869dde8aaff 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionErrors.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionErrors.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionForm.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionForm.java
index 3f3bc7a419d..3f3bc7a419d 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionForm.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionForm.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionFormBean.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionFormBean.java
index e8a837d1787..e8a837d1787 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionFormBean.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionFormBean.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionForward.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionForward.java
index c55cf28e15c..c55cf28e15c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionForward.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionForward.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionMapping.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionMapping.java
index 984076f00eb..984076f00eb 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionMapping.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionMapping.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionMessage.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionMessage.java
index 0bd483ecfe8..0bd483ecfe8 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionMessage.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionMessage.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionMessages.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionMessages.java
index 423170410c1..423170410c1 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionMessages.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionMessages.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionRedirect.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionRedirect.java
index 3290e366b7e..3290e366b7e 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionRedirect.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionRedirect.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionResources.properties b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionResources.properties
index bbd6dc7a7f4..bbd6dc7a7f4 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionResources.properties
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionResources.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionResources_ja.properties b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionResources_ja.properties
index 6809c536871..6809c536871 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionResources_ja.properties
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionResources_ja.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionServlet.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionServlet.java
index 62638f70726..62638f70726 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionServlet.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionServlet.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionServletWrapper.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionServletWrapper.java
index 8518d8a1486..8518d8a1486 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionServletWrapper.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ActionServletWrapper.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/DynaActionForm.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/DynaActionForm.java
index 1ed28db5829..1ed28db5829 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/DynaActionForm.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/DynaActionForm.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java
index c79a87fb20e..c79a87fb20e 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/DynaActionFormClass.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ExceptionHandler.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ExceptionHandler.java
index 16678788167..16678788167 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ExceptionHandler.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ExceptionHandler.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ForwardingActionForward.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ForwardingActionForward.java
index a047dc8cc8c..a047dc8cc8c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ForwardingActionForward.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/ForwardingActionForward.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/InvalidCancelException.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/InvalidCancelException.java
index bbed26fa876..bbed26fa876 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/InvalidCancelException.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/InvalidCancelException.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/LocalStrings.properties b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/LocalStrings.properties
index 6cc13967d2c..6cc13967d2c 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/LocalStrings.properties
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/LocalStrings.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/LocalStrings_ja.properties b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/LocalStrings_ja.properties
index f74cef636d9..f74cef636d9 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/LocalStrings_ja.properties
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/LocalStrings_ja.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/PlugIn.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/PlugIn.java
index 477efe05957..477efe05957 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/PlugIn.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/PlugIn.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/RedirectingActionForward.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/RedirectingActionForward.java
index cc6a28f742c..cc6a28f742c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/RedirectingActionForward.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/RedirectingActionForward.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/RequestActionMapping.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/RequestActionMapping.java
index 63ab5863a98..63ab5863a98 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/RequestActionMapping.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/RequestActionMapping.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/RequestProcessor.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/RequestProcessor.java
index e99c5d995bd..e99c5d995bd 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/RequestProcessor.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/RequestProcessor.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/SessionActionMapping.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/SessionActionMapping.java
index e9d82db1f30..e9d82db1f30 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/SessionActionMapping.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/SessionActionMapping.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/doc-files/actionUML.gif b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/doc-files/actionUML.gif
index 1c741189bf2..1c741189bf2 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/doc-files/actionUML.gif
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/doc-files/actionUML.gif
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/package.html
index a33277daf94..a33277daf94 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/action/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/ComposableRequestProcessor.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/ComposableRequestProcessor.java
index 57c206b3462..57c206b3462 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/ComposableRequestProcessor.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/ComposableRequestProcessor.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/Constants.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/Constants.java
index 75d45475350..75d45475350 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/Constants.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/Constants.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
index be7be115f6a..be7be115f6a 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
index 709847d0c6d..709847d0c6d 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java
index e68283b014f..e68283b014f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java
index 385c4b417cd..385c4b417cd 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java
index 69aaa9e0be3..69aaa9e0be3 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java
index ce5d985a2d6..ce5d985a2d6 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
index 778be80ec76..778be80ec76 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java
index 662593679d0..662593679d0 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java
index abc7e4ade37..abc7e4ade37 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java
index 8d297c251e8..8d297c251e8 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
index 4bd94bde81b..4bd94bde81b 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
index 8c6542d17ec..8c6542d17ec 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java
index 11dfd6f9bfd..11dfd6f9bfd 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java
index 480278ecaad..480278ecaad 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
index c414998f7b1..c414998f7b1 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java
index f39ba368cfe..f39ba368cfe 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ActionCommand.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ActionCommand.java
index 26bd4637f26..26bd4637f26 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ActionCommand.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ActionCommand.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ActionCommandBase.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ActionCommandBase.java
index c9b3eed6d79..c9b3eed6d79 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ActionCommandBase.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ActionCommandBase.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java
index f556aa61ec1..f556aa61ec1 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
index 270c7268289..270c7268289 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
index c4e53ab9b03..c4e53ab9b03 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ExecuteForwardCommand.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ExecuteForwardCommand.java
index d9179b18e0c..d9179b18e0c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ExecuteForwardCommand.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/ExecuteForwardCommand.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/InvalidPathException.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/InvalidPathException.java
index 00c0c4575bd..00c0c4575bd 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/InvalidPathException.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/InvalidPathException.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java
index e1697b081ef..e1697b081ef 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java
index 43c0980aedd..43c0980aedd 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/UnauthorizedActionException.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/UnauthorizedActionException.java
index f64b37b9abf..f64b37b9abf 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/UnauthorizedActionException.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/UnauthorizedActionException.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
index 2fc7eef90cf..2fc7eef90cf 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/generic/CopyFormToContext.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
index 6345aff93de..6345aff93de 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/generic/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/generic/package.html
index 432b49cab33..432b49cab33 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/generic/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/generic/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/package.html
index 9cef8cf25ec..9cef8cf25ec 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/AuthorizeAction.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/AuthorizeAction.java
index 7651b89c899..7651b89c899 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/AuthorizeAction.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/AuthorizeAction.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/CreateAction.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/CreateAction.java
index 9ff04178897..9ff04178897 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/CreateAction.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/CreateAction.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/ExceptionHandler.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/ExceptionHandler.java
index b1b9fd177b2..b1b9fd177b2 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/ExceptionHandler.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/ExceptionHandler.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/ExecuteAction.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/ExecuteAction.java
index 280a9b4ac75..280a9b4ac75 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/ExecuteAction.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/ExecuteAction.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformForward.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformForward.java
index d4a6997dd60..d4a6997dd60 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformForward.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformForward.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformInclude.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformInclude.java
index 636bd831aba..636bd831aba 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformInclude.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/PerformInclude.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/PopulateActionForm.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/PopulateActionForm.java
index 59e587ed03f..59e587ed03f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/PopulateActionForm.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/PopulateActionForm.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/RequestNoCache.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/RequestNoCache.java
index 4929113815b..4929113815b 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/RequestNoCache.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/RequestNoCache.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java
index 2d12620cb53..2d12620cb53 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectAction.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectForward.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectForward.java
index 00bbdf09f8a..00bbdf09f8a 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectForward.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectForward.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectInput.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectInput.java
index 508f542211e..508f542211e 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectInput.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectInput.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectLocale.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectLocale.java
index 9001b34a2d0..9001b34a2d0 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectLocale.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectLocale.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectModule.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectModule.java
index 13cc039e844..13cc039e844 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectModule.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SelectModule.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SetContentType.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SetContentType.java
index 8468fa7dd94..8468fa7dd94 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SetContentType.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SetContentType.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SetOriginalURI.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SetOriginalURI.java
index 072c243e396..072c243e396 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SetOriginalURI.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/SetOriginalURI.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/ValidateActionForm.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/ValidateActionForm.java
index abc223cc9e4..abc223cc9e4 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/ValidateActionForm.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/ValidateActionForm.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/package.html
index 937edf55324..937edf55324 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/servlet/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/util/ClassUtils.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/util/ClassUtils.java
index 3d3a86f33d9..3d3a86f33d9 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/util/ClassUtils.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/util/ClassUtils.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/util/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/util/package.html
index 77b3ca4ea65..77b3ca4ea65 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/util/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/commands/util/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ActionContext.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ActionContext.java
index f445fac1232..f445fac1232 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ActionContext.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ActionContext.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ActionContextBase.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ActionContextBase.java
index 087198979e6..087198979e6 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ActionContextBase.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ActionContextBase.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ContextWrapper.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ContextWrapper.java
index 00029f13649..00029f13649 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ContextWrapper.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ContextWrapper.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/MockActionContext.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/MockActionContext.java
index 29a82b2d106..29a82b2d106 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/MockActionContext.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/MockActionContext.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ServletActionContext.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ServletActionContext.java
index 9356a77bc0c..9356a77bc0c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ServletActionContext.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/ServletActionContext.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/WebActionContext.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/WebActionContext.java
index 6d53f26c99d..6d53f26c99d 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/WebActionContext.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/WebActionContext.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/package.html
index 629f6a5ac1a..629f6a5ac1a 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/contexts/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/package.html
index 4d7518c84e8..4d7518c84e8 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/chain/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ActionConfig.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ActionConfig.java
index 0ab92a820d0..0ab92a820d0 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ActionConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ActionConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ActionConfigMatcher.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ActionConfigMatcher.java
index a1af2db44e2..a1af2db44e2 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ActionConfigMatcher.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ActionConfigMatcher.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/BaseConfig.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/BaseConfig.java
index 52ca3b338a8..52ca3b338a8 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/BaseConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/BaseConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ConfigHelper.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ConfigHelper.java
index 26eab9cf8e2..26eab9cf8e2 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ConfigHelper.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ConfigHelper.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ConfigHelperInterface.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ConfigHelperInterface.java
index 1cef2a40632..1cef2a40632 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ConfigHelperInterface.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ConfigHelperInterface.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ConfigRuleSet.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ConfigRuleSet.java
index ca3e216fc50..ca3e216fc50 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ConfigRuleSet.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ConfigRuleSet.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ControllerConfig.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ControllerConfig.java
index 7d9c4925776..7d9c4925776 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ControllerConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ControllerConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ExceptionConfig.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ExceptionConfig.java
index 515c9b1844a..515c9b1844a 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ExceptionConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ExceptionConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/FormBeanConfig.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/FormBeanConfig.java
index c8bc9ca57a3..c8bc9ca57a3 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/FormBeanConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/FormBeanConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/FormPropertyConfig.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/FormPropertyConfig.java
index b1462a0afa5..b1462a0afa5 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/FormPropertyConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/FormPropertyConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ForwardConfig.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ForwardConfig.java
index 241320b348b..241320b348b 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ForwardConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ForwardConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/MessageResourcesConfig.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/MessageResourcesConfig.java
index 9e5fec65974..9e5fec65974 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/MessageResourcesConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/MessageResourcesConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ModuleConfig.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ModuleConfig.java
index f0c5b838e5e..f0c5b838e5e 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ModuleConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ModuleConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ModuleConfigFactory.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ModuleConfigFactory.java
index d2c05ccf970..d2c05ccf970 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ModuleConfigFactory.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/ModuleConfigFactory.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/PlugInConfig.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/PlugInConfig.java
index cde647c8d8a..cde647c8d8a 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/PlugInConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/PlugInConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/doc-files/configUML.gif b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/doc-files/configUML.gif
index f9d82929942..f9d82929942 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/doc-files/configUML.gif
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/doc-files/configUML.gif
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/impl/DefaultModuleConfigFactory.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/impl/DefaultModuleConfigFactory.java
index 9a6c6801099..9a6c6801099 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/impl/DefaultModuleConfigFactory.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/impl/DefaultModuleConfigFactory.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/impl/ModuleConfigImpl.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/impl/ModuleConfigImpl.java
index d08a6647085..d08a6647085 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/impl/ModuleConfigImpl.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/impl/ModuleConfigImpl.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/impl/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/impl/package.html
index 36aad1c5765..36aad1c5765 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/impl/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/impl/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/package.html
index 49de1b9d5c7..49de1b9d5c7 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/config/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/doc-files/Stamp.gif b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/doc-files/Stamp.gif
index 720e284bb4e..720e284bb4e 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/doc-files/Stamp.gif
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/doc-files/Stamp.gif
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/doc-files/jakarta-feather-small.gif b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/doc-files/jakarta-feather-small.gif
index b479bdbd2b1..b479bdbd2b1 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/doc-files/jakarta-feather-small.gif
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/doc-files/jakarta-feather-small.gif
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockAction.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockAction.java
index 1c7c58e6ac1..1c7c58e6ac1 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockAction.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockAction.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockActionServlet.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockActionServlet.java
index 6612651246d..6612651246d 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockActionServlet.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockActionServlet.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockEnumeration.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockEnumeration.java
index 2e38a39895d..2e38a39895d 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockEnumeration.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockEnumeration.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockFormBean.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockFormBean.java
index e22770cbef4..e22770cbef4 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockFormBean.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockFormBean.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockHttpServletRequest.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockHttpServletRequest.java
index e08cf06f902..e08cf06f902 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockHttpServletRequest.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockHttpServletRequest.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockHttpServletResponse.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockHttpServletResponse.java
index 757be562223..757be562223 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockHttpServletResponse.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockHttpServletResponse.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockHttpSession.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockHttpSession.java
index eb8bcf5f38f..eb8bcf5f38f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockHttpSession.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockHttpSession.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockMultipartRequestHandler.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockMultipartRequestHandler.java
index 0da44a1546f..0da44a1546f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockMultipartRequestHandler.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockMultipartRequestHandler.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockPageContext.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockPageContext.java
index e28b5b2cb61..e28b5b2cb61 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockPageContext.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockPageContext.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockPrincipal.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockPrincipal.java
index 85ed973bb51..85ed973bb51 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockPrincipal.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockPrincipal.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockServletConfig.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockServletConfig.java
index 437a48501f9..437a48501f9 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockServletConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockServletConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockServletContext.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockServletContext.java
index ed5e1f14364..ed5e1f14364 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockServletContext.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/MockServletContext.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/TestMockBase.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/TestMockBase.java
index bcd5c25b62c..bcd5c25b62c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/TestMockBase.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/TestMockBase.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/package.html
index 148fa65be79..148fa65be79 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/mock/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/package.html
index daff8c38931..daff8c38931 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java
index 6ef37451289..6ef37451289 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/FormFile.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/FormFile.java
index 30d8a94637e..30d8a94637e 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/FormFile.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/FormFile.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/MultipartRequestHandler.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/MultipartRequestHandler.java
index 6272b4baa3b..6272b4baa3b 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/MultipartRequestHandler.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/MultipartRequestHandler.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/MultipartRequestWrapper.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/MultipartRequestWrapper.java
index cf7760286fb..cf7760286fb 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/MultipartRequestWrapper.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/MultipartRequestWrapper.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/doc-files/uploadUML.jpg b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/doc-files/uploadUML.jpg
index 01d2abd4a46..01d2abd4a46 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/doc-files/uploadUML.jpg
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/doc-files/uploadUML.jpg
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/package.html
index 13c895af543..13c895af543 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/upload/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ImageButtonBean.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ImageButtonBean.java
index 50684cb7c1a..50684cb7c1a 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ImageButtonBean.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ImageButtonBean.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/IteratorAdapter.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/IteratorAdapter.java
index 8a6bff04e47..8a6bff04e47 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/IteratorAdapter.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/IteratorAdapter.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/LabelValueBean.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/LabelValueBean.java
index 6268d569703..6268d569703 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/LabelValueBean.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/LabelValueBean.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/LocalStrings.properties b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/LocalStrings.properties
index ff86644cd88..ff86644cd88 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/LocalStrings.properties
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/LocalStrings.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/LocalStrings_ja.properties b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/LocalStrings_ja.properties
index d53bbfbcdfd..d53bbfbcdfd 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/LocalStrings_ja.properties
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/LocalStrings_ja.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/MessageResources.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/MessageResources.java
index ff2d3741e88..ff2d3741e88 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/MessageResources.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/MessageResources.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/MessageResourcesFactory.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/MessageResourcesFactory.java
index 68d6164b794..68d6164b794 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/MessageResourcesFactory.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/MessageResourcesFactory.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ModuleException.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ModuleException.java
index abad43d373f..abad43d373f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ModuleException.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ModuleException.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ModuleUtils.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ModuleUtils.java
index 390445e69e5..390445e69e5 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ModuleUtils.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ModuleUtils.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java
index 43b4330f46e..43b4330f46e 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/PropertyMessageResources.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/PropertyMessageResourcesFactory.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/PropertyMessageResourcesFactory.java
index eb6d7a4e4b2..eb6d7a4e4b2 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/PropertyMessageResourcesFactory.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/PropertyMessageResourcesFactory.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/RequestUtils.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/RequestUtils.java
index 3d6a9c4d1cf..3d6a9c4d1cf 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/RequestUtils.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/RequestUtils.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ResponseUtils.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ResponseUtils.java
index ca77d382b6f..ca77d382b6f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ResponseUtils.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ResponseUtils.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ServletContextWriter.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ServletContextWriter.java
index cd41a6b5f84..cd41a6b5f84 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ServletContextWriter.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/ServletContextWriter.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/TokenProcessor.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/TokenProcessor.java
index 1c619ef0b50..1c619ef0b50 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/TokenProcessor.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/TokenProcessor.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/WildcardHelper.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/WildcardHelper.java
index 60ca42fc7ff..60ca42fc7ff 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/WildcardHelper.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/WildcardHelper.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/package.html
index a009957199b..a009957199b 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/util/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/BeanValidatorForm.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/BeanValidatorForm.java
index 22729113bf8..22729113bf8 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/BeanValidatorForm.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/BeanValidatorForm.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/DynaValidatorForm.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/DynaValidatorForm.java
index f535d1fb168..f535d1fb168 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/DynaValidatorForm.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/DynaValidatorForm.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/FieldChecks.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/FieldChecks.java
index feefe290fb7..feefe290fb7 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/FieldChecks.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/FieldChecks.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/LazyValidatorForm.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/LazyValidatorForm.java
index 5ee1cdf9a9c..5ee1cdf9a9c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/LazyValidatorForm.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/LazyValidatorForm.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/LocalStrings.properties b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/LocalStrings.properties
index 734b94ba0e7..734b94ba0e7 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/LocalStrings.properties
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/LocalStrings.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/Resources.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/Resources.java
index 4e8352ffd95..4e8352ffd95 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/Resources.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/Resources.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/ValidatorForm.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
index 8e5b8f8da80..8e5b8f8da80 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java
index 1b2b8f60c06..1b2b8f60c06 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/ValidatorPlugIn.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/doc-files/validatorUML.jpg b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/doc-files/validatorUML.jpg
index 0fe54c4a761..0fe54c4a761 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/doc-files/validatorUML.jpg
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/doc-files/validatorUML.jpg
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/package.html
index a45adf7fac6..a45adf7fac6 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhen.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhen.java
index 5bac37f748a..5bac37f748a 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhen.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhen.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java
index a5ce43a9a25..a5ce43a9a25 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenLexer.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g
index 9eab87a8686..9eab87a8686 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.g
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java
index a8fb0c67f8f..a8fb0c67f8f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParser.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java
index dc8de105966..dc8de105966 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.txt b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.txt
index 50a81c65b47..50a81c65b47 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.txt
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.txt
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/package.html b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/package.html
index 10dee73edbb..10dee73edbb 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/package.html
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/readme.txt b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/readme.txt
index 8e10981730a..8e10981730a 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/readme.txt
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/java/org/apache/struts/validator/validwhen/readme.txt
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/LICENSE.txt b/tests/projects/struts-1.3.9-diet/core/src/main/resources/LICENSE.txt
index dd5b3a58aa1..dd5b3a58aa1 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/LICENSE.txt
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/resources/LICENSE.txt
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/NOTICE.txt b/tests/projects/struts-1.3.9-diet/core/src/main/resources/NOTICE.txt
index 30195b66e79..30195b66e79 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/NOTICE.txt
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/resources/NOTICE.txt
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/chain/chain-config.xml b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/chain/chain-config.xml
index 0ad8e0be065..0ad8e0be065 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/chain/chain-config.xml
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/chain/chain-config.xml
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_0.dtd b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_0.dtd
index 063c021a980..063c021a980 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_0.dtd
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_0.dtd
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_1.dtd b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_1.dtd
index 0ecb92a5586..0ecb92a5586 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_1.dtd
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_1.dtd
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_2.dtd b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_2.dtd
index ec1a3d0aaff..ec1a3d0aaff 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_2.dtd
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_2.dtd
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_3.dtd b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_3.dtd
index a9aed162c56..a9aed162c56 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_3.dtd
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/struts-config_1_3.dtd
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/web-app_2_3.dtd b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/web-app_2_3.dtd
index ba39dc9135c..ba39dc9135c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/web-app_2_3.dtd
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/resources/web-app_2_3.dtd
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/validator/validator-rules-compressed.xml b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/validator/validator-rules-compressed.xml
index e5e4aa96501..e5e4aa96501 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/validator/validator-rules-compressed.xml
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/validator/validator-rules-compressed.xml
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/validator/validator-rules.xml b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/validator/validator-rules.xml
index 7465070da0c..7465070da0c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/validator/validator-rules.xml
+++ b/tests/projects/struts-1.3.9-diet/core/src/main/resources/org/apache/struts/validator/validator-rules.xml
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionMessage.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionMessage.java
index 66daa7f05a4..66daa7f05a4 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionMessage.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionMessage.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionMessages.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionMessages.java
index 4fa6aa52e28..4fa6aa52e28 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionMessages.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionMessages.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionRedirect.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionRedirect.java
index 7ee3d4e0efd..7ee3d4e0efd 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionRedirect.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionRedirect.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionServlet.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionServlet.java
index f2ecf0f62ca..f2ecf0f62ca 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionServlet.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestActionServlet.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java
index d287c28de5f..d287c28de5f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestDynaActionForm.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java
index 44fe93e9cfd..44fe93e9cfd 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/action/TestDynaActionFormClass.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/generic/TestCopyFormToContext.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/generic/TestCopyFormToContext.java
index abccc0c30f7..abccc0c30f7 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/generic/TestCopyFormToContext.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/generic/TestCopyFormToContext.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/generic/TestWrappingLookupCommand.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/generic/TestWrappingLookupCommand.java
index 235bedaaae4..235bedaaae4 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/generic/TestWrappingLookupCommand.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/generic/TestWrappingLookupCommand.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/servlet/TestAuthorizeAction.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/servlet/TestAuthorizeAction.java
index 89cc2c923f5..89cc2c923f5 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/servlet/TestAuthorizeAction.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/servlet/TestAuthorizeAction.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/servlet/TestPerformForward.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/servlet/TestPerformForward.java
index 47a544a8761..47a544a8761 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/servlet/TestPerformForward.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/servlet/TestPerformForward.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/servlet/TestSetOriginalURI.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/servlet/TestSetOriginalURI.java
index 4b36a2fec95..4b36a2fec95 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/servlet/TestSetOriginalURI.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/chain/commands/servlet/TestSetOriginalURI.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/CustomMappingTest.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/CustomMappingTest.java
index b7db1e53c8b..b7db1e53c8b 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/CustomMappingTest.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/CustomMappingTest.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestActionConfig.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestActionConfig.java
index eb3848dfd6d..eb3848dfd6d 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestActionConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestActionConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestActionConfigMatcher.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestActionConfigMatcher.java
index 19d0ce3a7dd..19d0ce3a7dd 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestActionConfigMatcher.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestActionConfigMatcher.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestFormBeanConfig.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestFormBeanConfig.java
index 652143e7bec..652143e7bec 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestFormBeanConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestFormBeanConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestFormPropertyConfig.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestFormPropertyConfig.java
index c69e4cb582b..c69e4cb582b 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestFormPropertyConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestFormPropertyConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestForwardConfig.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestForwardConfig.java
index aef989f5788..aef989f5788 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestForwardConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestForwardConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestModuleConfig.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestModuleConfig.java
index b3bb0d0346c..b3bb0d0346c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestModuleConfig.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/TestModuleConfig.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config-1.1.xml b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config-1.1.xml
index 0dc40369fc6..0dc40369fc6 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config-1.1.xml
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config-1.1.xml
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config-custom-mapping-1.1.xml b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config-custom-mapping-1.1.xml
index 99caf1fe028..99caf1fe028 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config-custom-mapping-1.1.xml
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config-custom-mapping-1.1.xml
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config-custom-mapping.xml b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config-custom-mapping.xml
index a0dfb0ddb6f..a0dfb0ddb6f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config-custom-mapping.xml
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config-custom-mapping.xml
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config.xml b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config.xml
index b7625f24a3c..b7625f24a3c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config.xml
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/config/struts-config.xml
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo.properties b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo.properties
index aa2b373729c..aa2b373729c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo.properties
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_de.properties b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_de.properties
index d070535a527..d070535a527 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_de.properties
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_de.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_de_DE.properties b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_de_DE.properties
index 90b7eceb08c..90b7eceb08c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_de_DE.properties
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_de_DE.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_en.properties b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_en.properties
index 39872deb995..39872deb995 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_en.properties
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_en.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_en_US.properties b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_en_US.properties
index d2f6d6018ec..d2f6d6018ec 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_en_US.properties
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/Foo_en_US.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/TestPropertyMessageResources.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/TestPropertyMessageResources.java
index c1b618021b2..c1b618021b2 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/TestPropertyMessageResources.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/TestPropertyMessageResources.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/TestRequestUtils.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/TestRequestUtils.java
index 50d35dd1196..50d35dd1196 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/TestRequestUtils.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/TestRequestUtils.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java
index 757c1372ac6..757c1372ac6 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/util/TestRequestUtilsPopulate.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/validator/PojoBean.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/validator/PojoBean.java
index 4a886c87523..4a886c87523 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/validator/PojoBean.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/validator/PojoBean.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/validator/TestValidWhen.java b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/validator/TestValidWhen.java
index 176bce65d4a..176bce65d4a 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/validator/TestValidWhen.java
+++ b/tests/projects/struts-1.3.9-diet/core/src/test/java/org/apache/struts/validator/TestValidWhen.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/pom.xml b/tests/projects/struts-1.3.9-diet/pom.xml
index b3ee7d7151e..b3ee7d7151e 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/pom.xml
+++ b/tests/projects/struts-1.3.9-diet/pom.xml
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/pom.xml b/tests/projects/struts-1.3.9-diet/taglib/pom.xml
index ab2bdbdcdec..ab2bdbdcdec 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/pom.xml
+++ b/tests/projects/struts-1.3.9-diet/taglib/pom.xml
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/LocalStrings.properties b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/LocalStrings.properties
index c1729a57c5e..c1729a57c5e 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/LocalStrings.properties
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/LocalStrings.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/LocalStrings_ja.properties b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/LocalStrings_ja.properties
index d64ec22703f..d64ec22703f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/LocalStrings_ja.properties
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/LocalStrings_ja.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
index 7c44e60a50b..7c44e60a50b 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/TagUtils.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/CookieTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/CookieTag.java
index 66198db74f2..66198db74f2 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/CookieTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/CookieTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/CookieTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/CookieTei.java
index 54b06084485..54b06084485 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/CookieTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/CookieTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/DefineTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/DefineTag.java
index a0369f1e81e..a0369f1e81e 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/DefineTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/DefineTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/DefineTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/DefineTei.java
index 4bfe9abb3c0..4bfe9abb3c0 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/DefineTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/DefineTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/HeaderTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/HeaderTag.java
index a90ba88bcbd..a90ba88bcbd 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/HeaderTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/HeaderTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/HeaderTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/HeaderTei.java
index 4b27be53de0..4b27be53de0 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/HeaderTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/HeaderTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
index 02c82bb0f5d..02c82bb0f5d 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTei.java
index 61cd6d8680c..61cd6d8680c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/IncludeTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings.properties b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings.properties
index bfb58c937b7..bfb58c937b7 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings.properties
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings_ja.properties b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings_ja.properties
index b1629b2e6cb..b1629b2e6cb 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings_ja.properties
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/LocalStrings_ja.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/MessageTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/MessageTag.java
index a51b43ff92c..a51b43ff92c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/MessageTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/MessageTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/PageTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/PageTag.java
index 164b57e0776..164b57e0776 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/PageTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/PageTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/PageTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/PageTei.java
index 76ce596cabc..76ce596cabc 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/PageTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/PageTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ParameterTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ParameterTag.java
index 77b1275ea16..77b1275ea16 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ParameterTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ParameterTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ParameterTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ParameterTei.java
index b08f496ebba..b08f496ebba 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ParameterTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ParameterTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTag.java
index 6e4fc49201a..6e4fc49201a 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTei.java
index 95bbf31a030..95bbf31a030 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/ResourceTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/SizeTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/SizeTag.java
index dd2b47f0c2d..dd2b47f0c2d 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/SizeTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/SizeTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/SizeTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/SizeTei.java
index f27cea037b7..f27cea037b7 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/SizeTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/SizeTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/StrutsTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/StrutsTag.java
index cc4a8a3fea9..cc4a8a3fea9 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/StrutsTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/StrutsTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/StrutsTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/StrutsTei.java
index c3ebb88f9c8..c3ebb88f9c8 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/StrutsTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/StrutsTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/WriteTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/WriteTag.java
index 9b4d90f2204..9b4d90f2204 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/WriteTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/WriteTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/doc-files/beanUML.gif b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/doc-files/beanUML.gif
index d19250c412d..d19250c412d 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/doc-files/beanUML.gif
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/doc-files/beanUML.gif
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/package.html b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/package.html
index 4b75847cdd3..4b75847cdd3 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/package.html
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/bean/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseFieldTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseFieldTag.java
index 95e35d0631d..95e35d0631d 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseFieldTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseFieldTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java
index 47ece643fb7..47ece643fb7 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseHandlerTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseInputTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseInputTag.java
index 4a189714599..4a189714599 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseInputTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseInputTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java
index 88c9478b15f..88c9478b15f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/BaseTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ButtonTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ButtonTag.java
index 3e6af64f5d8..3e6af64f5d8 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ButtonTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ButtonTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/CancelTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/CancelTag.java
index 62143fe87df..62143fe87df 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/CancelTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/CancelTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/CheckboxTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/CheckboxTag.java
index 9f6c8f1c3e5..9f6c8f1c3e5 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/CheckboxTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/CheckboxTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/Constants.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/Constants.java
index b63e1e38ea4..b63e1e38ea4 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/Constants.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/Constants.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ErrorsTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ErrorsTag.java
index ef5b39aac5f..ef5b39aac5f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ErrorsTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ErrorsTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/FileTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/FileTag.java
index 7bf33d77fdf..7bf33d77fdf 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/FileTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/FileTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
index dd168bedec0..dd168bedec0 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/FormTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/FrameTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/FrameTag.java
index 1358bff4790..1358bff4790 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/FrameTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/FrameTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/HiddenTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/HiddenTag.java
index d619dff1224..d619dff1224 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/HiddenTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/HiddenTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/HtmlTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/HtmlTag.java
index 7ee09d37ea6..7ee09d37ea6 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/HtmlTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/HtmlTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ImageTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ImageTag.java
index f41269c65d3..f41269c65d3 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ImageTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ImageTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ImgTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ImgTag.java
index 28363532e14..28363532e14 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ImgTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ImgTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
index 9306bfae4dd..9306bfae4dd 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/JavascriptValidatorTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java
index 6095f9c66db..6095f9c66db 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/LinkTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/LocalStrings.properties b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/LocalStrings.properties
index 5359d483865..5359d483865 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/LocalStrings.properties
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/LocalStrings.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/LocalStrings_ja.properties b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/LocalStrings_ja.properties
index 0f4458d0f37..0f4458d0f37 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/LocalStrings_ja.properties
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/LocalStrings_ja.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/MessagesTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/MessagesTag.java
index 3f57d3be12f..3f57d3be12f 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/MessagesTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/MessagesTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/MessagesTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/MessagesTei.java
index 6c3c6da88c9..6c3c6da88c9 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/MessagesTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/MessagesTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java
index 44b3d3eef8e..44b3d3eef8e 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/MultiboxTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/OptionTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/OptionTag.java
index 8c710721382..8c710721382 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/OptionTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/OptionTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/OptionsCollectionTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/OptionsCollectionTag.java
index c8e5a4d4548..c8e5a4d4548 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/OptionsCollectionTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/OptionsCollectionTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java
index d9e025332a4..d9e025332a4 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/OptionsTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ParamTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ParamTag.java
index 100f78146d9..100f78146d9 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ParamTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ParamTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/PasswordTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/PasswordTag.java
index 6ba429cffc2..6ba429cffc2 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/PasswordTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/PasswordTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/RadioTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/RadioTag.java
index f58135fd0cf..f58135fd0cf 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/RadioTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/RadioTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ResetTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ResetTag.java
index b0b380d77d7..b0b380d77d7 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ResetTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/ResetTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java
index f33b61440fd..f33b61440fd 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/RewriteTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java
index 4f58c005893..4f58c005893 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/SubmitTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/SubmitTag.java
index f8c254189b0..f8c254189b0 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/SubmitTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/SubmitTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/TextTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/TextTag.java
index f4d2f1535af..f4d2f1535af 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/TextTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/TextTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/TextareaTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/TextareaTag.java
index 0b71b67bf3c..0b71b67bf3c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/TextareaTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/TextareaTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/XhtmlTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/XhtmlTag.java
index 6f6ae8c2f7a..6f6ae8c2f7a 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/XhtmlTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/XhtmlTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/doc-files/htmlUML.gif b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/doc-files/htmlUML.gif
index 7dacbba68e5..7dacbba68e5 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/doc-files/htmlUML.gif
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/doc-files/htmlUML.gif
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/package.html b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/package.html
index e2e8af61996..e2e8af61996 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/package.html
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/html/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/CompareTagBase.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/CompareTagBase.java
index c57c518fc8b..c57c518fc8b 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/CompareTagBase.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/CompareTagBase.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/ConditionalTagBase.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/ConditionalTagBase.java
index 7b34fe1affa..7b34fe1affa 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/ConditionalTagBase.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/ConditionalTagBase.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/EmptyTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/EmptyTag.java
index ed91fa994e5..ed91fa994e5 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/EmptyTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/EmptyTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/EqualTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/EqualTag.java
index d17893793f4..d17893793f4 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/EqualTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/EqualTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/ForwardTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/ForwardTag.java
index 47d664638d9..47d664638d9 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/ForwardTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/ForwardTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/GreaterEqualTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/GreaterEqualTag.java
index 977f35a5bae..977f35a5bae 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/GreaterEqualTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/GreaterEqualTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/GreaterThanTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/GreaterThanTag.java
index 9a03b957383..9a03b957383 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/GreaterThanTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/GreaterThanTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java
index c3c60e7e119..c3c60e7e119 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTei.java
index 7c7cad5c491..7c7cad5c491 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/IterateTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LessEqualTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LessEqualTag.java
index 3da02552f4d..3da02552f4d 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LessEqualTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LessEqualTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LessThanTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LessThanTag.java
index fceaef102f0..fceaef102f0 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LessThanTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LessThanTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LocalStrings.properties b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LocalStrings.properties
index 0f8ec27ad87..0f8ec27ad87 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LocalStrings.properties
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LocalStrings.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LocalStrings_ja.properties b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LocalStrings_ja.properties
index 80d53643cc7..80d53643cc7 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LocalStrings_ja.properties
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/LocalStrings_ja.properties
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/MatchTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/MatchTag.java
index b3da1d0d8c6..b3da1d0d8c6 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/MatchTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/MatchTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/MessagesNotPresentTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/MessagesNotPresentTag.java
index cee59ca0524..cee59ca0524 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/MessagesNotPresentTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/MessagesNotPresentTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/MessagesPresentTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/MessagesPresentTag.java
index d654771dd56..d654771dd56 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/MessagesPresentTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/MessagesPresentTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotEmptyTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotEmptyTag.java
index 75b141a7343..75b141a7343 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotEmptyTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotEmptyTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotEqualTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotEqualTag.java
index 38604822955..38604822955 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotEqualTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotEqualTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotMatchTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotMatchTag.java
index f203363dfc8..f203363dfc8 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotMatchTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotMatchTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotPresentTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotPresentTag.java
index aa6cbd64bcc..aa6cbd64bcc 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotPresentTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/NotPresentTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/PresentTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/PresentTag.java
index b313106bda0..b313106bda0 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/PresentTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/PresentTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/RedirectTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/RedirectTag.java
index 6a3a9a2186d..6a3a9a2186d 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/RedirectTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/RedirectTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/doc-files/logicUML.gif b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/doc-files/logicUML.gif
index e24bcf98489..e24bcf98489 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/doc-files/logicUML.gif
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/doc-files/logicUML.gif
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/package.html b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/package.html
index 4e9a8b5b2f7..4e9a8b5b2f7 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/package.html
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/logic/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedNameSupport.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedNameSupport.java
index 23056eb6a98..23056eb6a98 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedNameSupport.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedNameSupport.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedParentSupport.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedParentSupport.java
index bdf9d122985..bdf9d122985 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedParentSupport.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedParentSupport.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedPropertyHelper.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedPropertyHelper.java
index 1ed3721d335..1ed3721d335 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedPropertyHelper.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedPropertyHelper.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedPropertySupport.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedPropertySupport.java
index 9c780d4fe78..9c780d4fe78 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedPropertySupport.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedPropertySupport.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedPropertyTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedPropertyTag.java
index 50e5c8dcce3..50e5c8dcce3 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedPropertyTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedPropertyTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedReference.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedReference.java
index 5210d74d7df..5210d74d7df 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedReference.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedReference.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedRootTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedRootTag.java
index 052eda6aa10..052eda6aa10 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedRootTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedRootTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedTagSupport.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedTagSupport.java
index 8c4a96556ee..8c4a96556ee 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedTagSupport.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedTagSupport.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedWriteNestingTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedWriteNestingTag.java
index b68b8dfc2d2..b68b8dfc2d2 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedWriteNestingTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedWriteNestingTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedWriteNestingTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedWriteNestingTei.java
index e98a4363536..e98a4363536 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedWriteNestingTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/NestedWriteNestingTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedDefineTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedDefineTag.java
index 76f78e4bdf9..76f78e4bdf9 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedDefineTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedDefineTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedDefineTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedDefineTei.java
index f4e73019b5e..f4e73019b5e 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedDefineTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedDefineTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedMessageTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedMessageTag.java
index 46d830d6db7..46d830d6db7 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedMessageTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedMessageTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedSizeTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedSizeTag.java
index 4abe939c765..4abe939c765 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedSizeTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedSizeTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedWriteTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedWriteTag.java
index 5f192be3ad6..5f192be3ad6 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedWriteTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/NestedWriteTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/doc-files/nested-bean.gif b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/doc-files/nested-bean.gif
index f9f6a4869f1..f9f6a4869f1 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/doc-files/nested-bean.gif
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/doc-files/nested-bean.gif
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/package.html b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/package.html
index e7c20a1879c..e7c20a1879c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/package.html
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/bean/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/doc-files/nestedUML.gif b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/doc-files/nestedUML.gif
index 6f8c9429f21..6f8c9429f21 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/doc-files/nestedUML.gif
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/doc-files/nestedUML.gif
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedCheckboxTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedCheckboxTag.java
index 6d90242d4ff..6d90242d4ff 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedCheckboxTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedCheckboxTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedErrorsTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedErrorsTag.java
index 6cfaea6c6ae..6cfaea6c6ae 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedErrorsTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedErrorsTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedFileTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedFileTag.java
index 8c2f6cf4785..8c2f6cf4785 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedFileTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedFileTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedFormTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedFormTag.java
index 4975e11e17d..4975e11e17d 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedFormTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedFormTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedHiddenTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedHiddenTag.java
index 55cb68402d1..55cb68402d1 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedHiddenTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedHiddenTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedImageTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedImageTag.java
index 20cc4079b19..20cc4079b19 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedImageTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedImageTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedImgTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedImgTag.java
index 9b341f5c452..9b341f5c452 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedImgTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedImgTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedLinkTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedLinkTag.java
index 6c61c48c229..6c61c48c229 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedLinkTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedLinkTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedMessagesTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedMessagesTag.java
index 7d9b2fee56e..7d9b2fee56e 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedMessagesTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedMessagesTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedMultiboxTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedMultiboxTag.java
index 4e8da0dd404..4e8da0dd404 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedMultiboxTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedMultiboxTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedOptionsCollectionTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedOptionsCollectionTag.java
index 7a7b363fb9b..7a7b363fb9b 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedOptionsCollectionTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedOptionsCollectionTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedOptionsTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedOptionsTag.java
index 5a3ded4e798..5a3ded4e798 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedOptionsTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedOptionsTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedPasswordTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedPasswordTag.java
index 8368120eb54..8368120eb54 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedPasswordTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedPasswordTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedRadioTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedRadioTag.java
index 44ec52ec519..44ec52ec519 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedRadioTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedRadioTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedSelectTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedSelectTag.java
index bc303794ec4..bc303794ec4 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedSelectTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedSelectTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedSubmitTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedSubmitTag.java
index e7c1a05e305..e7c1a05e305 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedSubmitTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedSubmitTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedTextTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedTextTag.java
index f83ec261207..f83ec261207 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedTextTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedTextTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedTextareaTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedTextareaTag.java
index f3b1e6b5878..f3b1e6b5878 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedTextareaTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/NestedTextareaTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/doc-files/nested-html.gif b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/doc-files/nested-html.gif
index b905cc2a6bf..b905cc2a6bf 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/doc-files/nested-html.gif
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/doc-files/nested-html.gif
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/package.html b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/package.html
index 4d209132401..4d209132401 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/package.html
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/html/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedEmptyTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedEmptyTag.java
index 72c5f1d1085..72c5f1d1085 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedEmptyTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedEmptyTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedEqualTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedEqualTag.java
index 47486704317..47486704317 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedEqualTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedEqualTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedGreaterEqualTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedGreaterEqualTag.java
index 6bede06337b..6bede06337b 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedGreaterEqualTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedGreaterEqualTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedGreaterThanTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedGreaterThanTag.java
index 9d18b194880..9d18b194880 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedGreaterThanTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedGreaterThanTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedIterateTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedIterateTag.java
index 63c79db036e..63c79db036e 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedIterateTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedIterateTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedIterateTei.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedIterateTei.java
index 39ebe6db88c..39ebe6db88c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedIterateTei.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedIterateTei.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedLessEqualTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedLessEqualTag.java
index 3a0f39b4f1c..3a0f39b4f1c 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedLessEqualTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedLessEqualTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedLessThanTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedLessThanTag.java
index 21154631cd3..21154631cd3 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedLessThanTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedLessThanTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedMatchTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedMatchTag.java
index 0d542f9a515..0d542f9a515 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedMatchTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedMatchTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedMessagesNotPresentTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedMessagesNotPresentTag.java
index 429e241b4a6..429e241b4a6 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedMessagesNotPresentTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedMessagesNotPresentTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedMessagesPresentTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedMessagesPresentTag.java
index 22b16db205e..22b16db205e 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedMessagesPresentTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedMessagesPresentTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotEmptyTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotEmptyTag.java
index bd202367446..bd202367446 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotEmptyTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotEmptyTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotEqualTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotEqualTag.java
index 4612cd063fb..4612cd063fb 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotEqualTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotEqualTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotMatchTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotMatchTag.java
index 607be560498..607be560498 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotMatchTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotMatchTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotPresentTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotPresentTag.java
index 340a80cb547..340a80cb547 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotPresentTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedNotPresentTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedPresentTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedPresentTag.java
index 8cc76660e55..8cc76660e55 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedPresentTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/NestedPresentTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/doc-files/nested-logic.gif b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/doc-files/nested-logic.gif
index ea3195f6d75..ea3195f6d75 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/doc-files/nested-logic.gif
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/doc-files/nested-logic.gif
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/package.html b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/package.html
index 0740191a0d1..0740191a0d1 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/package.html
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/logic/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/package.html b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/package.html
index ac2d886c4ba..ac2d886c4ba 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/package.html
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/java/org/apache/struts/taglib/nested/package.html
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/resources/LICENSE.txt b/tests/projects/struts-1.3.9-diet/taglib/src/main/resources/LICENSE.txt
index dd5b3a58aa1..dd5b3a58aa1 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/resources/LICENSE.txt
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/resources/LICENSE.txt
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-bean.tld b/tests/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-bean.tld
index c671763a271..c671763a271 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-bean.tld
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-bean.tld
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-html.tld b/tests/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-html.tld
index b410e955e93..b410e955e93 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-html.tld
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-html.tld
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-logic.tld b/tests/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-logic.tld
index 9337bb503d5..9337bb503d5 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-logic.tld
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-logic.tld
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-nested.tld b/tests/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-nested.tld
index a22ed584b2d..a22ed584b2d 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-nested.tld
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/resources/META-INF/tld/struts-nested.tld
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/resources/NOTICE.txt b/tests/projects/struts-1.3.9-diet/taglib/src/main/resources/NOTICE.txt
index 4d4e9ae54ec..4d4e9ae54ec 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/main/resources/NOTICE.txt
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/main/resources/NOTICE.txt
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/TagTestBase.java b/tests/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/TagTestBase.java
index 12cf29f15b3..12cf29f15b3 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/TagTestBase.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/TagTestBase.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java b/tests/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java
index 120ee3a7f28..120ee3a7f28 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/TestTagUtils.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/html/TestHtmlTag.java b/tests/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/html/TestHtmlTag.java
index 54ee70e9d9a..54ee70e9d9a 100644
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/html/TestHtmlTag.java
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/html/TestHtmlTag.java
diff --git a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/sample.properties b/tests/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/sample.properties
index a1ea57b7e33..a1ea57b7e33 100755
--- a/tests/upgrade/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/sample.properties
+++ b/tests/projects/struts-1.3.9-diet/taglib/src/test/java/org/apache/struts/taglib/sample.properties
diff --git a/it/it-projects/testing/README.txt b/tests/projects/testing/README.txt
index c21c5ec3452..c21c5ec3452 100644
--- a/it/it-projects/testing/README.txt
+++ b/tests/projects/testing/README.txt
diff --git a/it/it-projects/testing/xoo-half-covered/pom.xml b/tests/projects/testing/xoo-half-covered/pom.xml
index 25b230c7864..25b230c7864 100644
--- a/it/it-projects/testing/xoo-half-covered/pom.xml
+++ b/tests/projects/testing/xoo-half-covered/pom.xml
diff --git a/it/it-projects/testing/xoo-half-covered/sonar-project.properties b/tests/projects/testing/xoo-half-covered/sonar-project.properties
index ea64e84c3a0..ea64e84c3a0 100644
--- a/it/it-projects/testing/xoo-half-covered/sonar-project.properties
+++ b/tests/projects/testing/xoo-half-covered/sonar-project.properties
diff --git a/it/it-projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/Covered.xoo b/tests/projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/Covered.xoo
index fc6abc4a88e..fc6abc4a88e 100644
--- a/it/it-projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/Covered.xoo
+++ b/tests/projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/Covered.xoo
diff --git a/it/it-projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/Covered.xoo.coverage b/tests/projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/Covered.xoo.coverage
index 0f42ea6e2b5..0f42ea6e2b5 100644
--- a/it/it-projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/Covered.xoo.coverage
+++ b/tests/projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/Covered.xoo.coverage
diff --git a/it/it-projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/UnCovered.xoo b/tests/projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/UnCovered.xoo
index 25f413c7c5a..25f413c7c5a 100644
--- a/it/it-projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/UnCovered.xoo
+++ b/tests/projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/UnCovered.xoo
diff --git a/it/it-projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/UnCovered.xoo.coverage b/tests/projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/UnCovered.xoo.coverage
index 126ba135e20..126ba135e20 100644
--- a/it/it-projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/UnCovered.xoo.coverage
+++ b/tests/projects/testing/xoo-half-covered/src/main/xoo/org/sonar/tests/halfcovered/UnCovered.xoo.coverage
diff --git a/it/it-projects/testing/xoo-sample-it-coverage/sonar-project.properties b/tests/projects/testing/xoo-sample-it-coverage/sonar-project.properties
index 18e56c6eb75..18e56c6eb75 100644
--- a/it/it-projects/testing/xoo-sample-it-coverage/sonar-project.properties
+++ b/tests/projects/testing/xoo-sample-it-coverage/sonar-project.properties
diff --git a/it/it-projects/testing/xoo-sample-it-coverage/src/main/xoo/sample/Sample.xoo b/tests/projects/testing/xoo-sample-it-coverage/src/main/xoo/sample/Sample.xoo
index 41871e123a3..41871e123a3 100644
--- a/it/it-projects/testing/xoo-sample-it-coverage/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/testing/xoo-sample-it-coverage/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/testing/xoo-sample-it-coverage/src/main/xoo/sample/Sample.xoo.itcoverage b/tests/projects/testing/xoo-sample-it-coverage/src/main/xoo/sample/Sample.xoo.itcoverage
index 36860af51ff..36860af51ff 100644
--- a/it/it-projects/testing/xoo-sample-it-coverage/src/main/xoo/sample/Sample.xoo.itcoverage
+++ b/tests/projects/testing/xoo-sample-it-coverage/src/main/xoo/sample/Sample.xoo.itcoverage
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v1/sonar-project.properties b/tests/projects/testing/xoo-sample-new-coverage-v1/sonar-project.properties
index a711b2bd89e..a711b2bd89e 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v1/sonar-project.properties
+++ b/tests/projects/testing/xoo-sample-new-coverage-v1/sonar-project.properties
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo b/tests/projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo
index 41871e123a3..41871e123a3 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.coverage b/tests/projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.coverage
index a2d656d1c9d..a2d656d1c9d 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.coverage
+++ b/tests/projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.coverage
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.itcoverage b/tests/projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.itcoverage
index a2d656d1c9d..a2d656d1c9d 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.itcoverage
+++ b/tests/projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.itcoverage
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.measures
index 18b6b8eb944..18b6b8eb944 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.overallcoverage b/tests/projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.overallcoverage
index a2d656d1c9d..a2d656d1c9d 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.overallcoverage
+++ b/tests/projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.overallcoverage
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.scm b/tests/projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.scm
index e047ea4394e..e047ea4394e 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.scm
+++ b/tests/projects/testing/xoo-sample-new-coverage-v1/src/main/xoo/sample/Sample.xoo.scm
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v2/sonar-project.properties b/tests/projects/testing/xoo-sample-new-coverage-v2/sonar-project.properties
index a711b2bd89e..a711b2bd89e 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v2/sonar-project.properties
+++ b/tests/projects/testing/xoo-sample-new-coverage-v2/sonar-project.properties
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo b/tests/projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo
index 83b519b4b1a..83b519b4b1a 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.coverage b/tests/projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.coverage
index cd6fabd8eec..cd6fabd8eec 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.coverage
+++ b/tests/projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.coverage
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.itcoverage b/tests/projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.itcoverage
index 77bdb584a48..77bdb584a48 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.itcoverage
+++ b/tests/projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.itcoverage
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.measures b/tests/projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.measures
index e4f33ed58ed..e4f33ed58ed 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.overallcoverage b/tests/projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.overallcoverage
index ab5d844418e..ab5d844418e 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.overallcoverage
+++ b/tests/projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.overallcoverage
diff --git a/it/it-projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.scm b/tests/projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.scm
index 06d9b20756a..06d9b20756a 100644
--- a/it/it-projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.scm
+++ b/tests/projects/testing/xoo-sample-new-coverage-v2/src/main/xoo/sample/Sample.xoo.scm
diff --git a/it/it-projects/testing/xoo-sample-overall-coverage/sonar-project.properties b/tests/projects/testing/xoo-sample-overall-coverage/sonar-project.properties
index 65fb9b6ed33..65fb9b6ed33 100644
--- a/it/it-projects/testing/xoo-sample-overall-coverage/sonar-project.properties
+++ b/tests/projects/testing/xoo-sample-overall-coverage/sonar-project.properties
diff --git a/it/it-projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo b/tests/projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo
index 1674d4578dc..1674d4578dc 100644
--- a/it/it-projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo.coverage b/tests/projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo.coverage
index 1c244dbc697..1c244dbc697 100644
--- a/it/it-projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo.coverage
+++ b/tests/projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo.coverage
diff --git a/it/it-projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo.itcoverage b/tests/projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo.itcoverage
index 808d5b37e98..808d5b37e98 100644
--- a/it/it-projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo.itcoverage
+++ b/tests/projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo.itcoverage
diff --git a/it/it-projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo.overallcoverage b/tests/projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo.overallcoverage
index 82024035bff..82024035bff 100644
--- a/it/it-projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo.overallcoverage
+++ b/tests/projects/testing/xoo-sample-overall-coverage/src/main/xoo/sample/Sample.xoo.overallcoverage
diff --git a/it/it-projects/testing/xoo-sample-ut-coverage-no-condition/sonar-project.properties b/tests/projects/testing/xoo-sample-ut-coverage-no-condition/sonar-project.properties
index a931c4c7093..a931c4c7093 100644
--- a/it/it-projects/testing/xoo-sample-ut-coverage-no-condition/sonar-project.properties
+++ b/tests/projects/testing/xoo-sample-ut-coverage-no-condition/sonar-project.properties
diff --git a/it/it-projects/testing/xoo-sample-ut-coverage-no-condition/src/main/xoo/sample/Sample.xoo b/tests/projects/testing/xoo-sample-ut-coverage-no-condition/src/main/xoo/sample/Sample.xoo
index 41871e123a3..41871e123a3 100644
--- a/it/it-projects/testing/xoo-sample-ut-coverage-no-condition/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/testing/xoo-sample-ut-coverage-no-condition/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/testing/xoo-sample-ut-coverage-no-condition/src/main/xoo/sample/Sample.xoo.coverage b/tests/projects/testing/xoo-sample-ut-coverage-no-condition/src/main/xoo/sample/Sample.xoo.coverage
index 5e59aed012e..5e59aed012e 100644
--- a/it/it-projects/testing/xoo-sample-ut-coverage-no-condition/src/main/xoo/sample/Sample.xoo.coverage
+++ b/tests/projects/testing/xoo-sample-ut-coverage-no-condition/src/main/xoo/sample/Sample.xoo.coverage
diff --git a/it/it-projects/testing/xoo-sample-ut-coverage/sonar-project.properties b/tests/projects/testing/xoo-sample-ut-coverage/sonar-project.properties
index a931c4c7093..a931c4c7093 100644
--- a/it/it-projects/testing/xoo-sample-ut-coverage/sonar-project.properties
+++ b/tests/projects/testing/xoo-sample-ut-coverage/sonar-project.properties
diff --git a/it/it-projects/testing/xoo-sample-ut-coverage/src/main/xoo/sample/Sample.xoo b/tests/projects/testing/xoo-sample-ut-coverage/src/main/xoo/sample/Sample.xoo
index 41871e123a3..41871e123a3 100644
--- a/it/it-projects/testing/xoo-sample-ut-coverage/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/testing/xoo-sample-ut-coverage/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/testing/xoo-sample-ut-coverage/src/main/xoo/sample/Sample.xoo.coverage b/tests/projects/testing/xoo-sample-ut-coverage/src/main/xoo/sample/Sample.xoo.coverage
index 36860af51ff..36860af51ff 100644
--- a/it/it-projects/testing/xoo-sample-ut-coverage/src/main/xoo/sample/Sample.xoo.coverage
+++ b/tests/projects/testing/xoo-sample-ut-coverage/src/main/xoo/sample/Sample.xoo.coverage
diff --git a/it/it-projects/testing/xoo-sample-with-coverage-per-test/sonar-project.properties b/tests/projects/testing/xoo-sample-with-coverage-per-test/sonar-project.properties
index 0f2415d0320..0f2415d0320 100644
--- a/it/it-projects/testing/xoo-sample-with-coverage-per-test/sonar-project.properties
+++ b/tests/projects/testing/xoo-sample-with-coverage-per-test/sonar-project.properties
diff --git a/tests/perf/projects/xoo-sample/src/main/xoo/sample/Sample.xoo b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/main/xoo/sample/Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/tests/perf/projects/xoo-sample/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/main/xoo/sample/Sample2.xoo b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/main/xoo/sample/Sample2.xoo
index ed097595590..ed097595590 100644
--- a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/main/xoo/sample/Sample2.xoo
+++ b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/main/xoo/sample/Sample2.xoo
diff --git a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/Sample2Test.xoo b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/Sample2Test.xoo
index fe2368fefaa..fe2368fefaa 100644
--- a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/Sample2Test.xoo
+++ b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/Sample2Test.xoo
diff --git a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/Sample2Test.xoo.test b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/Sample2Test.xoo.test
index 9686b58c1d6..9686b58c1d6 100644
--- a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/Sample2Test.xoo.test
+++ b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/Sample2Test.xoo.test
diff --git a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/Sample2Test.xoo.testcoverage b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/Sample2Test.xoo.testcoverage
index b7f37235ced..b7f37235ced 100644
--- a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/Sample2Test.xoo.testcoverage
+++ b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/Sample2Test.xoo.testcoverage
diff --git a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/SampleTest.xoo b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/SampleTest.xoo
index fe2368fefaa..fe2368fefaa 100644
--- a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/SampleTest.xoo
+++ b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/SampleTest.xoo
diff --git a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/SampleTest.xoo.test b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/SampleTest.xoo.test
index b0259693199..b0259693199 100644
--- a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/SampleTest.xoo.test
+++ b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/SampleTest.xoo.test
diff --git a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/SampleTest.xoo.testcoverage b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/SampleTest.xoo.testcoverage
index f6765cf74f0..f6765cf74f0 100644
--- a/it/it-projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/SampleTest.xoo.testcoverage
+++ b/tests/projects/testing/xoo-sample-with-coverage-per-test/src/test/xoo/sample/SampleTest.xoo.testcoverage
diff --git a/it/it-projects/testing/xoo-sample-with-tests-execution-details/sonar-project.properties b/tests/projects/testing/xoo-sample-with-tests-execution-details/sonar-project.properties
index 0f2415d0320..0f2415d0320 100644
--- a/it/it-projects/testing/xoo-sample-with-tests-execution-details/sonar-project.properties
+++ b/tests/projects/testing/xoo-sample-with-tests-execution-details/sonar-project.properties
diff --git a/it/it-projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo b/tests/projects/testing/xoo-sample-with-tests-execution-details/src/main/xoo/sample/Sample.xoo
index 385b2a549d9..b1210973dd9 100644
--- a/it/it-projects/highlighting/xoo-sample-with-highlighting-v1/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/testing/xoo-sample-with-tests-execution-details/src/main/xoo/sample/Sample.xoo
@@ -1,12 +1,12 @@
-package sample;

-

-public class Sample {

-	

-	public Sample(int i) {

-		int j = i++;

-	}

-	

-	private String myMethod() {

-		return "hello";

-	}

-}

+package sample;
+
+public class Sample {
+	
+	public Sample(int i) {
+		int j = i++;
+	}
+	
+	private String myMethod() {
+		return "hello";
+	}
+}
diff --git a/it/it-projects/testing/xoo-sample-with-tests-execution-details/src/test/xoo/sample/SampleTest.xoo b/tests/projects/testing/xoo-sample-with-tests-execution-details/src/test/xoo/sample/SampleTest.xoo
index fe2368fefaa..fe2368fefaa 100644
--- a/it/it-projects/testing/xoo-sample-with-tests-execution-details/src/test/xoo/sample/SampleTest.xoo
+++ b/tests/projects/testing/xoo-sample-with-tests-execution-details/src/test/xoo/sample/SampleTest.xoo
diff --git a/it/it-projects/testing/xoo-sample-with-tests-execution-details/src/test/xoo/sample/SampleTest.xoo.test b/tests/projects/testing/xoo-sample-with-tests-execution-details/src/test/xoo/sample/SampleTest.xoo.test
index b0259693199..b0259693199 100644
--- a/it/it-projects/testing/xoo-sample-with-tests-execution-details/src/test/xoo/sample/SampleTest.xoo.test
+++ b/tests/projects/testing/xoo-sample-with-tests-execution-details/src/test/xoo/sample/SampleTest.xoo.test
diff --git a/it/it-projects/testing/xoo-sample-with-tests-execution-measures/sonar-project.properties b/tests/projects/testing/xoo-sample-with-tests-execution-measures/sonar-project.properties
index 0f2415d0320..0f2415d0320 100644
--- a/it/it-projects/testing/xoo-sample-with-tests-execution-measures/sonar-project.properties
+++ b/tests/projects/testing/xoo-sample-with-tests-execution-measures/sonar-project.properties
diff --git a/it/it-projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo b/tests/projects/testing/xoo-sample-with-tests-execution-measures/src/main/xoo/sample/Sample.xoo
index 385b2a549d9..b1210973dd9 100644
--- a/it/it-projects/highlighting/xoo-sample-with-highlighting-v2/src/main/xoo/sample/Sample.xoo
+++ b/tests/projects/testing/xoo-sample-with-tests-execution-measures/src/main/xoo/sample/Sample.xoo
@@ -1,12 +1,12 @@
-package sample;

-

-public class Sample {

-	

-	public Sample(int i) {

-		int j = i++;

-	}

-	

-	private String myMethod() {

-		return "hello";

-	}

-}

+package sample;
+
+public class Sample {
+	
+	public Sample(int i) {
+		int j = i++;
+	}
+	
+	private String myMethod() {
+		return "hello";
+	}
+}
diff --git a/it/it-projects/testing/xoo-sample-with-tests-execution-measures/src/test/xoo/sample/SampleTest.xoo b/tests/projects/testing/xoo-sample-with-tests-execution-measures/src/test/xoo/sample/SampleTest.xoo
index fe2368fefaa..fe2368fefaa 100644
--- a/it/it-projects/testing/xoo-sample-with-tests-execution-measures/src/test/xoo/sample/SampleTest.xoo
+++ b/tests/projects/testing/xoo-sample-with-tests-execution-measures/src/test/xoo/sample/SampleTest.xoo
diff --git a/it/it-projects/testing/xoo-sample-with-tests-execution-measures/src/test/xoo/sample/SampleTest.xoo.measures b/tests/projects/testing/xoo-sample-with-tests-execution-measures/src/test/xoo/sample/SampleTest.xoo.measures
index de1549480b5..de1549480b5 100644
--- a/it/it-projects/testing/xoo-sample-with-tests-execution-measures/src/test/xoo/sample/SampleTest.xoo.measures
+++ b/tests/projects/testing/xoo-sample-with-tests-execution-measures/src/test/xoo/sample/SampleTest.xoo.measures
diff --git a/it/it-tests/src/test/java/pageobjects/BackgroundTaskItem.java b/tests/src/test/java/org/sonarqube/pageobjects/BackgroundTaskItem.java
index 3cdd14c16b7..aedd45ed305 100644
--- a/it/it-tests/src/test/java/pageobjects/BackgroundTaskItem.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/BackgroundTaskItem.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.SelenideElement;
 
diff --git a/it/it-tests/src/test/java/pageobjects/BackgroundTasksPage.java b/tests/src/test/java/org/sonarqube/pageobjects/BackgroundTasksPage.java
index 8093bcc8a5c..432e1addd8c 100644
--- a/it/it-tests/src/test/java/pageobjects/BackgroundTasksPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/BackgroundTasksPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.ElementsCollection;
 import java.util.List;
diff --git a/it/it-tests/src/test/java/pageobjects/EncryptionPage.java b/tests/src/test/java/org/sonarqube/pageobjects/EncryptionPage.java
index d601dbac1e0..f0c68849bfe 100644
--- a/it/it-tests/src/test/java/pageobjects/EncryptionPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/EncryptionPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.SelenideElement;
 
diff --git a/it/it-tests/src/test/java/pageobjects/LoginPage.java b/tests/src/test/java/org/sonarqube/pageobjects/LoginPage.java
index 88585279333..bb17d0961e3 100644
--- a/it/it-tests/src/test/java/pageobjects/LoginPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/LoginPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
diff --git a/it/it-tests/src/test/java/pageobjects/Navigation.java b/tests/src/test/java/org/sonarqube/pageobjects/Navigation.java
index c772b79a1c2..54363129fec 100644
--- a/it/it-tests/src/test/java/pageobjects/Navigation.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/Navigation.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.Selenide;
@@ -31,12 +31,12 @@ import javax.annotation.Nullable;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.html5.WebStorage;
-import org.sonarqube.test.Tester;
-import pageobjects.issues.IssuesPage;
-import pageobjects.licenses.LicensesPage;
-import pageobjects.organization.MembersPage;
-import pageobjects.projects.ProjectsPage;
-import pageobjects.settings.SettingsPage;
+import org.sonarqube.tests.Tester;
+import org.sonarqube.pageobjects.issues.IssuesPage;
+import org.sonarqube.pageobjects.licenses.LicensesPage;
+import org.sonarqube.pageobjects.organization.MembersPage;
+import org.sonarqube.pageobjects.projects.ProjectsPage;
+import org.sonarqube.pageobjects.settings.SettingsPage;
 
 import static com.codeborne.selenide.Condition.visible;
 import static com.codeborne.selenide.Selenide.$;
@@ -174,18 +174,18 @@ public class Navigation {
   }
 
   public Navigation shouldBeLoggedIn() {
-    loggedInDropdown().should(Condition.visible);
+    loggedInDropdown().should(visible);
     return this;
   }
 
   public Navigation shouldNotBeLoggedIn() {
-    logInLink().should(Condition.visible);
+    logInLink().should(visible);
     return this;
   }
 
   public LoginPage logIn() {
     logInLink().click();
-    return Selenide.page(LoginPage.class);
+    return page(LoginPage.class);
   }
 
   public Navigation logOut() {
diff --git a/it/it-tests/src/test/java/pageobjects/NotificationsPage.java b/tests/src/test/java/org/sonarqube/pageobjects/NotificationsPage.java
index 61704e7a88f..456f08ca957 100644
--- a/it/it-tests/src/test/java/pageobjects/NotificationsPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/NotificationsPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import static com.codeborne.selenide.Condition.cssClass;
 import static com.codeborne.selenide.Condition.text;
diff --git a/it/it-tests/src/test/java/pageobjects/ProjectActivityPage.java b/tests/src/test/java/org/sonarqube/pageobjects/ProjectActivityPage.java
index edf6692ff8a..05479cb6275 100644
--- a/it/it-tests/src/test/java/pageobjects/ProjectActivityPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/ProjectActivityPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
diff --git a/it/it-tests/src/test/java/pageobjects/ProjectAnalysisItem.java b/tests/src/test/java/org/sonarqube/pageobjects/ProjectAnalysisItem.java
index e4e4de006ec..2589fa20f02 100644
--- a/it/it-tests/src/test/java/pageobjects/ProjectAnalysisItem.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/ProjectAnalysisItem.java
@@ -17,9 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
-import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 
 import static com.codeborne.selenide.Condition.text;
@@ -35,7 +34,7 @@ public class ProjectAnalysisItem {
   }
 
   public ProjectAnalysisItem shouldHaveEventWithText(String text) {
-    elt.find(".project-activity-events").shouldHave(Condition.text(text));
+    elt.find(".project-activity-events").shouldHave(text(text));
     return this;
   }
 
diff --git a/it/it-tests/src/test/java/pageobjects/ProjectDashboardPage.java b/tests/src/test/java/org/sonarqube/pageobjects/ProjectDashboardPage.java
index 0bb44703f64..f576ea4cc32 100644
--- a/it/it-tests/src/test/java/pageobjects/ProjectDashboardPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/ProjectDashboardPage.java
@@ -17,11 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.SelenideElement;
 import java.util.Arrays;
-import java.util.List;
 
 import static com.codeborne.selenide.Condition.exist;
 import static com.codeborne.selenide.Condition.hasText;
diff --git a/it/it-tests/src/test/java/pageobjects/ProjectKeyPage.java b/tests/src/test/java/org/sonarqube/pageobjects/ProjectKeyPage.java
index fa5c9b03097..cf72bdadbe5 100644
--- a/it/it-tests/src/test/java/pageobjects/ProjectKeyPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/ProjectKeyPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.SelenideElement;
 
diff --git a/it/it-tests/src/test/java/pageobjects/ProjectLinkItem.java b/tests/src/test/java/org/sonarqube/pageobjects/ProjectLinkItem.java
index 119b2c1872b..c652e018e0d 100644
--- a/it/it-tests/src/test/java/pageobjects/ProjectLinkItem.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/ProjectLinkItem.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.SelenideElement;
 import org.openqa.selenium.NoSuchElementException;
diff --git a/it/it-tests/src/test/java/pageobjects/ProjectLinksPage.java b/tests/src/test/java/org/sonarqube/pageobjects/ProjectLinksPage.java
index 2b0642cc121..a4adbf396f3 100644
--- a/it/it-tests/src/test/java/pageobjects/ProjectLinksPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/ProjectLinksPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
diff --git a/it/it-tests/src/test/java/pageobjects/ProjectPermissionsPage.java b/tests/src/test/java/org/sonarqube/pageobjects/ProjectPermissionsPage.java
index 2bb8a07ba89..954ad779a07 100644
--- a/it/it-tests/src/test/java/pageobjects/ProjectPermissionsPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/ProjectPermissionsPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import static com.codeborne.selenide.Condition.cssClass;
 import static com.codeborne.selenide.Condition.exist;
diff --git a/it/it-tests/src/test/java/pageobjects/ProjectQualityGatePage.java b/tests/src/test/java/org/sonarqube/pageobjects/ProjectQualityGatePage.java
index e582a70b4d3..58e28acaacf 100644
--- a/it/it-tests/src/test/java/pageobjects/ProjectQualityGatePage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/ProjectQualityGatePage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.SelenideElement;
 
diff --git a/it/it-tests/src/test/java/pageobjects/ProjectsManagementPage.java b/tests/src/test/java/org/sonarqube/pageobjects/ProjectsManagementPage.java
index 2a937338dfa..ea5ff5c06db 100644
--- a/it/it-tests/src/test/java/pageobjects/ProjectsManagementPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/ProjectsManagementPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import static com.codeborne.selenide.Condition.exist;
 import static com.codeborne.selenide.Condition.text;
diff --git a/it/it-tests/src/test/java/pageobjects/RuleItem.java b/tests/src/test/java/org/sonarqube/pageobjects/RuleItem.java
index 9fe179d829e..b311f3555b8 100644
--- a/it/it-tests/src/test/java/pageobjects/RuleItem.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/RuleItem.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.SelenideElement;
 
diff --git a/it/it-tests/src/test/java/pageobjects/RulesPage.java b/tests/src/test/java/org/sonarqube/pageobjects/RulesPage.java
index ee90dd59849..35eda0b68e3 100644
--- a/it/it-tests/src/test/java/pageobjects/RulesPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/RulesPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
diff --git a/it/it-tests/src/test/java/pageobjects/SelenideConfig.java b/tests/src/test/java/org/sonarqube/pageobjects/SelenideConfig.java
index e03561fc867..32c6850f917 100644
--- a/it/it-tests/src/test/java/pageobjects/SelenideConfig.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/SelenideConfig.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.Configuration;
 import com.codeborne.selenide.WebDriverRunner;
diff --git a/it/it-tests/src/test/java/pageobjects/ServerIdPage.java b/tests/src/test/java/org/sonarqube/pageobjects/ServerIdPage.java
index d556181b67b..e65171c8425 100644
--- a/it/it-tests/src/test/java/pageobjects/ServerIdPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/ServerIdPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects;
+package org.sonarqube.pageobjects;
 
 import com.codeborne.selenide.SelenideElement;
 
diff --git a/it/it-tests/src/test/java/pageobjects/issues/Issue.java b/tests/src/test/java/org/sonarqube/pageobjects/issues/Issue.java
index 0781ae0c021..a2c6e64648e 100644
--- a/it/it-tests/src/test/java/pageobjects/issues/Issue.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/issues/Issue.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects.issues;
+package org.sonarqube.pageobjects.issues;
 
 import com.codeborne.selenide.SelenideElement;
 
diff --git a/it/it-tests/src/test/java/pageobjects/issues/IssuesPage.java b/tests/src/test/java/org/sonarqube/pageobjects/issues/IssuesPage.java
index 33972cc2823..d09c894f9d9 100644
--- a/it/it-tests/src/test/java/pageobjects/issues/IssuesPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/issues/IssuesPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects.issues;
+package org.sonarqube.pageobjects.issues;
 
 import com.codeborne.selenide.ElementsCollection;
 import java.util.List;
diff --git a/it/it-tests/src/test/java/pageobjects/licenses/LicenseItem.java b/tests/src/test/java/org/sonarqube/pageobjects/licenses/LicenseItem.java
index aaa390ac238..61b7753cc26 100644
--- a/it/it-tests/src/test/java/pageobjects/licenses/LicenseItem.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/licenses/LicenseItem.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects.licenses;
+package org.sonarqube.pageobjects.licenses;
 
 import com.codeborne.selenide.SelenideElement;
 
diff --git a/it/it-tests/src/test/java/pageobjects/licenses/LicensesPage.java b/tests/src/test/java/org/sonarqube/pageobjects/licenses/LicensesPage.java
index 393347b4d65..95e1f438f30 100644
--- a/it/it-tests/src/test/java/pageobjects/licenses/LicensesPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/licenses/LicensesPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects.licenses;
+package org.sonarqube.pageobjects.licenses;
 
 import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
diff --git a/it/it-tests/src/test/java/pageobjects/organization/MemberItem.java b/tests/src/test/java/org/sonarqube/pageobjects/organization/MemberItem.java
index 436637d489f..0de4be4c937 100644
--- a/it/it-tests/src/test/java/pageobjects/organization/MemberItem.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/organization/MemberItem.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package pageobjects.organization;
+package org.sonarqube.pageobjects.organization;
 
 import com.codeborne.selenide.CollectionCondition;
 import com.codeborne.selenide.Condition;
@@ -92,4 +92,4 @@ public class MemberItem {
     form.should(Condition.exist);
     return form;
   }
-}
\ No newline at end of file
+}
diff --git a/it/it-tests/src/test/java/pageobjects/organization/MembersPage.java b/tests/src/test/java/org/sonarqube/pageobjects/organization/MembersPage.java
index 56030c62133..76d091305f6 100644
--- a/it/it-tests/src/test/java/pageobjects/organization/MembersPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/organization/MembersPage.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package pageobjects.organization;
+package org.sonarqube.pageobjects.organization;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
@@ -32,7 +32,7 @@ import static com.codeborne.selenide.Selenide.$$;
 public class MembersPage {
 
   public MembersPage() {
-    $(".nav-tabs a.active").shouldBe(visible).shouldHave(Condition.text("Members"));
+    $(".nav-tabs a.active").shouldBe(visible).shouldHave(text("Members"));
   }
 
   public ElementsCollection getMembers() {
@@ -49,12 +49,12 @@ public class MembersPage {
   }
 
   public MembersPage searchForMember(String query) {
-    $("input.search-box-input").shouldBe(Condition.visible).val("").sendKeys(query);
+    $("input.search-box-input").shouldBe(visible).val("").sendKeys(query);
     return this;
   }
 
   public MembersPage canAddMember() {
-    $(".page-actions").shouldBe(Condition.visible);
+    $(".page-actions").shouldBe(visible);
     return this;
   }
 
@@ -77,7 +77,7 @@ public class MembersPage {
   }
 
   private SelenideElement getModal(String title) {
-    $(".modal-head").should(Condition.exist).shouldHave(Condition.text(title));
+    $(".modal-head").should(Condition.exist).shouldHave(text(title));
     SelenideElement form = $(".ReactModalPortal form");
     form.should(Condition.exist);
     return form;
diff --git a/it/it-tests/src/test/java/pageobjects/projects/FacetItem.java b/tests/src/test/java/org/sonarqube/pageobjects/projects/FacetItem.java
index 52f0f5bb70f..ec3197c5a62 100644
--- a/it/it-tests/src/test/java/pageobjects/projects/FacetItem.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/projects/FacetItem.java
@@ -17,12 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects.projects;
+package org.sonarqube.pageobjects.projects;
 
 import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.ElementsCollection;
 import com.codeborne.selenide.SelenideElement;
-import org.openqa.selenium.WebElement;
 
 public class FacetItem {
 
diff --git a/it/it-tests/src/test/java/pageobjects/projects/ProjectItem.java b/tests/src/test/java/org/sonarqube/pageobjects/projects/ProjectItem.java
index fc6cb1fb0dd..6261efa9129 100644
--- a/it/it-tests/src/test/java/pageobjects/projects/ProjectItem.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/projects/ProjectItem.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects.projects;
+package org.sonarqube.pageobjects.projects;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
diff --git a/it/it-tests/src/test/java/pageobjects/projects/ProjectsPage.java b/tests/src/test/java/org/sonarqube/pageobjects/projects/ProjectsPage.java
index 66bc7e5fda4..d019dcd74c8 100644
--- a/it/it-tests/src/test/java/pageobjects/projects/ProjectsPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/projects/ProjectsPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects.projects;
+package org.sonarqube.pageobjects.projects;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.ElementsCollection;
diff --git a/it/it-tests/src/test/java/pageobjects/settings/PropertySetInput.java b/tests/src/test/java/org/sonarqube/pageobjects/settings/PropertySetInput.java
index fde30b15c38..4f1c7db3a32 100644
--- a/it/it-tests/src/test/java/pageobjects/settings/PropertySetInput.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/settings/PropertySetInput.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects.settings;
+package org.sonarqube.pageobjects.settings;
 
 import com.codeborne.selenide.SelenideElement;
 
diff --git a/it/it-tests/src/test/java/pageobjects/settings/SettingsPage.java b/tests/src/test/java/org/sonarqube/pageobjects/settings/SettingsPage.java
index 704ba3054ae..1d1af886d1e 100644
--- a/it/it-tests/src/test/java/pageobjects/settings/SettingsPage.java
+++ b/tests/src/test/java/org/sonarqube/pageobjects/settings/SettingsPage.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package pageobjects.settings;
+package org.sonarqube.pageobjects.settings;
 
 import com.codeborne.selenide.SelenideElement;
 import org.openqa.selenium.By;
diff --git a/it/it-tests/src/test/java/it/Category1Suite.java b/tests/src/test/java/org/sonarqube/tests/Category1Suite.java
index af6812ff25a..b48b1283b8a 100644
--- a/it/it-tests/src/test/java/it/Category1Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category1Suite.java
@@ -17,41 +17,41 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it;
+package org.sonarqube.tests;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.administration.ProjectsAdministrationTest;
-import it.administration.UsersPageTest;
-import it.authorisation.ExecuteAnalysisPermissionTest;
-import it.authorisation.IssuePermissionTest;
-import it.authorisation.PermissionSearchTest;
-import it.authorisation.ProvisioningPermissionTest;
-import it.authorisation.QualityProfileAdminPermissionTest;
-import it.complexity.ComplexityMeasuresTest;
-import it.customMeasure.CustomMeasuresTest;
-import it.i18n.I18nTest;
-import it.measure.MeasuresWsTest;
-import it.measure.ProjectDashboardTest;
-import it.measure.ProjectMeasuresPageTest;
-import it.measureHistory.DifferentialPeriodsTest;
-import it.measureHistory.SincePreviousVersionHistoryTest;
-import it.measureHistory.SinceXDaysHistoryTest;
-import it.measureHistory.TimeMachineTest;
-import it.projectAdministration.BackgroundTasksTest;
-import it.projectAdministration.BulkDeletionTest;
-import it.projectAdministration.ProjectAdministrationTest;
-import it.projectAdministration.ProjectLinksPageTest;
-import it.projectSearch.ProjectsPageTest;
-import it.qualityGate.QualityGateNotificationTest;
-import it.qualityGate.QualityGateTest;
-import it.qualityGate.QualityGateUiTest;
-import it.settings.DeprecatedPropertiesWsTest;
-import it.settings.EmailsTest;
-import it.settings.PropertySetsTest;
-import it.settings.SettingsTest;
-import it.sourceCode.EncodingTest;
-import it.sourceCode.HighlightingTest;
-import it.sourceCode.ProjectCodeTest;
+import org.sonarqube.tests.projectAdministration.ProjectVisibilityTest;
+import org.sonarqube.tests.user.UsersPageTest;
+import org.sonarqube.tests.authorisation.ExecuteAnalysisPermissionTest;
+import org.sonarqube.tests.authorisation.IssuePermissionTest;
+import org.sonarqube.tests.authorisation.PermissionSearchTest;
+import org.sonarqube.tests.authorisation.ProvisioningPermissionTest;
+import org.sonarqube.tests.authorisation.QualityProfileAdminPermissionTest;
+import org.sonarqube.tests.complexity.ComplexityMeasuresTest;
+import org.sonarqube.tests.customMeasure.CustomMeasuresTest;
+import org.sonarqube.tests.i18n.I18nTest;
+import org.sonarqube.tests.measure.MeasuresWsTest;
+import org.sonarqube.tests.measure.ProjectDashboardTest;
+import org.sonarqube.tests.measure.ProjectMeasuresPageTest;
+import org.sonarqube.tests.measure.DifferentialPeriodsTest;
+import org.sonarqube.tests.measure.SincePreviousVersionHistoryTest;
+import org.sonarqube.tests.measure.SinceXDaysHistoryTest;
+import org.sonarqube.tests.measure.TimeMachineTest;
+import org.sonarqube.tests.projectAdministration.BackgroundTasksTest;
+import org.sonarqube.tests.projectAdministration.BulkDeletionTest;
+import org.sonarqube.tests.projectAdministration.ProjectAdministrationTest;
+import org.sonarqube.tests.projectAdministration.ProjectLinksPageTest;
+import org.sonarqube.tests.projectSearch.ProjectsPageTest;
+import org.sonarqube.tests.qualityGate.QualityGateNotificationTest;
+import org.sonarqube.tests.qualityGate.QualityGateTest;
+import org.sonarqube.tests.qualityGate.QualityGateUiTest;
+import org.sonarqube.tests.settings.DeprecatedPropertiesWsTest;
+import org.sonarqube.tests.settings.EmailsTest;
+import org.sonarqube.tests.settings.PropertySetsTest;
+import org.sonarqube.tests.settings.SettingsTest;
+import org.sonarqube.tests.sourceCode.EncodingTest;
+import org.sonarqube.tests.sourceCode.HighlightingTest;
+import org.sonarqube.tests.sourceCode.ProjectCodeTest;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
@@ -63,7 +63,7 @@ import static util.ItUtils.xooPlugin;
 @Suite.SuiteClasses({
   // administration
   UsersPageTest.class,
-  ProjectsAdministrationTest.class,
+  ProjectVisibilityTest.class,
   // project administration
   BulkDeletionTest.class,
   ProjectAdministrationTest.class,
diff --git a/it/it-tests/src/test/java/it/Category2Suite.java b/tests/src/test/java/org/sonarqube/tests/Category2Suite.java
index 2f59c261c95..c101253c84a 100644
--- a/it/it-tests/src/test/java/it/Category2Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category2Suite.java
@@ -17,40 +17,40 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it;
+package org.sonarqube.tests;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.issue.AutoAssignTest;
-import it.issue.CommonRulesTest;
-import it.issue.CustomRulesTest;
-import it.issue.IssueActionTest;
-import it.issue.IssueBulkChangeTest;
-import it.issue.IssueChangelogTest;
-import it.issue.IssueCreationTest;
-import it.issue.IssueFilterExtensionTest;
-import it.issue.IssueFilterOnCommonRulesTest;
-import it.issue.IssueFilterTest;
-import it.issue.IssueMeasureTest;
-import it.issue.IssueNotificationsTest;
-import it.issue.IssuePurgeTest;
-import it.issue.IssueSearchTest;
-import it.issue.IssueTrackingTest;
-import it.issue.IssueWorkflowTest;
-import it.issue.IssuesPageTest;
-import it.issue.NewIssuesMeasureTest;
-import it.qualityModel.MaintainabilityMeasureTest;
-import it.qualityModel.MaintainabilityRatingMeasureTest;
-import it.qualityModel.NewDebtRatioMeasureTest;
-import it.qualityModel.ReliabilityMeasureTest;
-import it.qualityModel.SecurityMeasureTest;
-import it.qualityModel.TechnicalDebtInIssueChangelogTest;
-import it.qualityModel.TechnicalDebtMeasureVariationTest;
-import it.qualityModel.TechnicalDebtTest;
-import it.scm.ScmTest;
-import it.test.CoverageTest;
-import it.test.CoverageTrackingTest;
-import it.test.NewCoverageTest;
-import it.test.TestExecutionTest;
+import org.sonarqube.tests.issue.AutoAssignTest;
+import org.sonarqube.tests.issue.CommonRulesTest;
+import org.sonarqube.tests.issue.CustomRulesTest;
+import org.sonarqube.tests.issue.IssueActionTest;
+import org.sonarqube.tests.issue.IssueBulkChangeTest;
+import org.sonarqube.tests.issue.IssueChangelogTest;
+import org.sonarqube.tests.issue.IssueCreationTest;
+import org.sonarqube.tests.issue.IssueFilterExtensionTest;
+import org.sonarqube.tests.issue.IssueFilterOnCommonRulesTest;
+import org.sonarqube.tests.issue.IssueFilterTest;
+import org.sonarqube.tests.issue.IssueMeasureTest;
+import org.sonarqube.tests.issue.IssueNotificationsTest;
+import org.sonarqube.tests.issue.IssuePurgeTest;
+import org.sonarqube.tests.issue.IssueSearchTest;
+import org.sonarqube.tests.issue.IssueTrackingTest;
+import org.sonarqube.tests.issue.IssueWorkflowTest;
+import org.sonarqube.tests.issue.IssuesPageTest;
+import org.sonarqube.tests.issue.NewIssuesMeasureTest;
+import org.sonarqube.tests.qualityModel.MaintainabilityMeasureTest;
+import org.sonarqube.tests.qualityModel.MaintainabilityRatingMeasureTest;
+import org.sonarqube.tests.qualityModel.NewDebtRatioMeasureTest;
+import org.sonarqube.tests.qualityModel.ReliabilityMeasureTest;
+import org.sonarqube.tests.qualityModel.SecurityMeasureTest;
+import org.sonarqube.tests.qualityModel.TechnicalDebtInIssueChangelogTest;
+import org.sonarqube.tests.qualityModel.TechnicalDebtMeasureVariationTest;
+import org.sonarqube.tests.qualityModel.TechnicalDebtTest;
+import org.sonarqube.tests.scm.ScmTest;
+import org.sonarqube.tests.test.CoverageTest;
+import org.sonarqube.tests.test.CoverageTrackingTest;
+import org.sonarqube.tests.test.NewCoverageTest;
+import org.sonarqube.tests.test.TestExecutionTest;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/it/it-tests/src/test/java/it/Category3Suite.java b/tests/src/test/java/org/sonarqube/tests/Category3Suite.java
index bad425d3544..25dd138a78e 100644
--- a/it/it-tests/src/test/java/it/Category3Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category3Suite.java
@@ -17,25 +17,25 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it;
+package org.sonarqube.tests;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.analysis.ExtensionLifecycleTest;
-import it.analysis.FavoriteTest;
-import it.analysis.IssueJsonReportTest;
-import it.analysis.IssuesModeTest;
-import it.analysis.LinksTest;
-import it.analysis.MultiLanguageTest;
-import it.analysis.PermissionTest;
-import it.analysis.ProjectBuilderTest;
-import it.analysis.ReportDumpTest;
-import it.analysis.SSLTest;
-import it.analysis.ScannerTest;
-import it.analysis.SettingsEncryptionTest;
-import it.analysis.TempFolderTest;
-import it.measure.DecimalScaleMetricTest;
-import it.plugins.VersionPluginTest;
-import it.webhook.WebhooksTest;
+import org.sonarqube.tests.analysis.ExtensionLifecycleTest;
+import org.sonarqube.tests.analysis.FavoriteTest;
+import org.sonarqube.tests.analysis.IssueJsonReportTest;
+import org.sonarqube.tests.analysis.IssuesModeTest;
+import org.sonarqube.tests.analysis.LinksTest;
+import org.sonarqube.tests.analysis.MultiLanguageTest;
+import org.sonarqube.tests.analysis.PermissionTest;
+import org.sonarqube.tests.analysis.ProjectBuilderTest;
+import org.sonarqube.tests.analysis.ReportDumpTest;
+import org.sonarqube.tests.analysis.SSLTest;
+import org.sonarqube.tests.analysis.ScannerTest;
+import org.sonarqube.tests.analysis.SettingsEncryptionTest;
+import org.sonarqube.tests.analysis.TempFolderTest;
+import org.sonarqube.tests.measure.DecimalScaleMetricTest;
+import org.sonarqube.tests.plugins.VersionPluginTest;
+import org.sonarqube.tests.webhook.WebhooksTest;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/it/it-tests/src/test/java/it/Category4Suite.java b/tests/src/test/java/org/sonarqube/tests/Category4Suite.java
index cbb752d4a71..79eebb60fa6 100644
--- a/it/it-tests/src/test/java/it/Category4Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category4Suite.java
@@ -17,37 +17,37 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it;
+package org.sonarqube.tests;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.analysisExclusion.FileExclusionsTest;
-import it.analysisExclusion.IssueExclusionsTest;
-import it.component.ComponentsWsTest;
-import it.component.ProjectsWsTest;
-import it.dbCleaner.PurgeTest;
-import it.duplication.CrossProjectDuplicationsOnRemoveFileTest;
-import it.duplication.CrossProjectDuplicationsTest;
-import it.duplication.DuplicationsTest;
-import it.duplication.NewDuplicationsTest;
-import it.organization.RootUserTest;
-import it.projectEvent.EventTest;
-import it.projectEvent.ProjectActivityPageTest;
-import it.qualityProfile.QualityProfilesUiTest;
-import it.serverSystem.HttpHeadersTest;
-import it.serverSystem.LogsTest;
-import it.serverSystem.PingTest;
-import it.serverSystem.ServerSystemTest;
-import it.ui.SourceViewerTest;
-import it.ui.UiTest;
-import it.uiExtension.UiExtensionsTest;
-import it.user.BaseIdentityProviderTest;
-import it.user.FavoritesWsTest;
-import it.user.ForceAuthenticationTest;
-import it.user.LocalAuthenticationTest;
-import it.user.MyAccountPageTest;
-import it.user.OAuth2IdentityProviderTest;
-import it.ws.WsLocalCallTest;
-import it.ws.WsTest;
+import org.sonarqube.tests.analysis.FileExclusionsTest;
+import org.sonarqube.tests.analysis.IssueExclusionsTest;
+import org.sonarqube.tests.component.ComponentsWsTest;
+import org.sonarqube.tests.component.ProjectsWsTest;
+import org.sonarqube.tests.dbCleaner.PurgeTest;
+import org.sonarqube.tests.duplication.CrossProjectDuplicationsOnRemoveFileTest;
+import org.sonarqube.tests.duplication.CrossProjectDuplicationsTest;
+import org.sonarqube.tests.duplication.DuplicationsTest;
+import org.sonarqube.tests.duplication.NewDuplicationsTest;
+import org.sonarqube.tests.organization.RootUserTest;
+import org.sonarqube.tests.projectEvent.EventTest;
+import org.sonarqube.tests.projectEvent.ProjectActivityPageTest;
+import org.sonarqube.tests.qualityProfile.QualityProfilesUiTest;
+import org.sonarqube.tests.serverSystem.HttpHeadersTest;
+import org.sonarqube.tests.serverSystem.LogsTest;
+import org.sonarqube.tests.serverSystem.PingTest;
+import org.sonarqube.tests.serverSystem.ServerSystemTest;
+import org.sonarqube.tests.ui.SourceViewerTest;
+import org.sonarqube.tests.ui.UiTest;
+import org.sonarqube.tests.ui.UiExtensionsTest;
+import org.sonarqube.tests.user.BaseIdentityProviderTest;
+import org.sonarqube.tests.user.FavoritesWsTest;
+import org.sonarqube.tests.user.ForceAuthenticationTest;
+import org.sonarqube.tests.user.LocalAuthenticationTest;
+import org.sonarqube.tests.user.MyAccountPageTest;
+import org.sonarqube.tests.user.OAuth2IdentityProviderTest;
+import org.sonarqube.tests.ws.WsLocalCallTest;
+import org.sonarqube.tests.ws.WsTest;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/it/it-tests/src/test/java/it/Category5Suite.java b/tests/src/test/java/org/sonarqube/tests/Category5Suite.java
index 4d952af58b9..283aea49471 100644
--- a/it/it-tests/src/test/java/it/Category5Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category5Suite.java
@@ -17,17 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it;
+package org.sonarqube.tests;
 
-import it.serverSystem.ClusterTest;
-import it.serverSystem.RestartTest;
-import it.serverSystem.ServerSystemRestartingOrchestrator;
-import it.settings.LicensesPageTest;
-import it.settings.SettingsTestRestartingOrchestrator;
-import it.updateCenter.UpdateCenterTest;
-import it.user.OnboardingTest;
-import it.user.RealmAuthenticationTest;
-import it.user.SsoAuthenticationTest;
+import org.sonarqube.tests.serverSystem.ClusterTest;
+import org.sonarqube.tests.serverSystem.RestartTest;
+import org.sonarqube.tests.serverSystem.ServerSystemRestartingOrchestrator;
+import org.sonarqube.tests.settings.LicensesPageTest;
+import org.sonarqube.tests.settings.SettingsTestRestartingOrchestrator;
+import org.sonarqube.tests.updateCenter.UpdateCenterTest;
+import org.sonarqube.tests.user.OnboardingTest;
+import org.sonarqube.tests.user.RealmAuthenticationTest;
+import org.sonarqube.tests.user.SsoAuthenticationTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/it/it-tests/src/test/java/it/Category6Suite.java b/tests/src/test/java/org/sonarqube/tests/Category6Suite.java
index cb9c6811313..96983945555 100644
--- a/it/it-tests/src/test/java/it/Category6Suite.java
+++ b/tests/src/test/java/org/sonarqube/tests/Category6Suite.java
@@ -17,24 +17,24 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it;
+package org.sonarqube.tests;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.issue.IssueTagsTest;
-import it.issue.OrganizationIssueAssignTest;
-import it.organization.BillingTest;
-import it.organization.OrganizationMembershipTest;
-import it.organization.OrganizationMembershipUiTest;
-import it.organization.OrganizationTest;
-import it.organization.PersonalOrganizationTest;
-import it.organization.RootUserOnOrganizationTest;
-import it.projectSearch.LeakProjectsPageTest;
-import it.projectSearch.SearchProjectsTest;
-import it.qualityProfile.BuiltInQualityProfilesTest;
-import it.qualityProfile.CustomQualityProfilesTest;
-import it.qualityProfile.OrganizationQualityProfilesUiTest;
-import it.uiExtension.OrganizationUiExtensionsTest;
-import it.user.OrganizationIdentityProviderTest;
+import org.sonarqube.tests.issue.IssueTagsTest;
+import org.sonarqube.tests.issue.OrganizationIssueAssignTest;
+import org.sonarqube.tests.organization.BillingTest;
+import org.sonarqube.tests.organization.OrganizationMembershipTest;
+import org.sonarqube.tests.organization.OrganizationMembershipUiTest;
+import org.sonarqube.tests.organization.OrganizationTest;
+import org.sonarqube.tests.organization.PersonalOrganizationTest;
+import org.sonarqube.tests.organization.RootUserOnOrganizationTest;
+import org.sonarqube.tests.projectSearch.LeakProjectsPageTest;
+import org.sonarqube.tests.projectSearch.SearchProjectsTest;
+import org.sonarqube.tests.qualityProfile.BuiltInQualityProfilesTest;
+import org.sonarqube.tests.qualityProfile.CustomQualityProfilesTest;
+import org.sonarqube.tests.qualityProfile.OrganizationQualityProfilesUiTest;
+import org.sonarqube.tests.ui.OrganizationUiExtensionsTest;
+import org.sonarqube.tests.user.OrganizationIdentityProviderTest;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/it/it-tests/src/test/java/org/sonarqube/test/GroupTester.java b/tests/src/test/java/org/sonarqube/tests/GroupTester.java
index 5b2242ee9c4..14568da774b 100644
--- a/it/it-tests/src/test/java/org/sonarqube/test/GroupTester.java
+++ b/tests/src/test/java/org/sonarqube/tests/GroupTester.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarqube.test;
+package org.sonarqube.tests;
 
 import java.util.List;
 import java.util.Set;
diff --git a/it/it-tests/src/test/java/org/sonarqube/test/OrganizationTester.java b/tests/src/test/java/org/sonarqube/tests/OrganizationTester.java
index 8925813d8fa..2072e87822a 100644
--- a/it/it-tests/src/test/java/org/sonarqube/test/OrganizationTester.java
+++ b/tests/src/test/java/org/sonarqube/tests/OrganizationTester.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarqube.test;
+package org.sonarqube.tests;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/tests/src/test/java/org/sonarqube/tests/ProjectTester.java b/tests/src/test/java/org/sonarqube/tests/ProjectTester.java
new file mode 100644
index 00000000000..781500aa8c0
--- /dev/null
+++ b/tests/src/test/java/org/sonarqube/tests/ProjectTester.java
@@ -0,0 +1,63 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonarqube.tests;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Consumer;
+import javax.annotation.Nullable;
+import org.sonarqube.ws.Organizations;
+import org.sonarqube.ws.WsProjects;
+import org.sonarqube.ws.client.project.CreateRequest;
+import org.sonarqube.ws.client.project.DeleteRequest;
+import org.sonarqube.ws.client.project.ProjectsService;
+import org.sonarqube.ws.client.project.SearchWsRequest;
+
+import static java.util.Arrays.stream;
+import static java.util.Collections.singletonList;
+
+public class ProjectTester {
+
+  private static final AtomicInteger ID_GENERATOR = new AtomicInteger();
+
+  private final Session session;
+
+  ProjectTester(Session session) {
+    this.session = session;
+  }
+
+  void deleteAll() {
+    ProjectsService service = session.wsClient().projects();
+    service.search(SearchWsRequest.builder().setQualifiers(singletonList("TRK")).build()).getComponentsList().forEach(p -> {
+      service.delete(DeleteRequest.builder().setKey(p.getKey()).build());
+    });
+  }
+
+  @SafeVarargs
+  public final WsProjects.CreateWsResponse.Project generate(@Nullable Organizations.Organization organization, Consumer<CreateRequest.Builder>... populators) {
+    int id = ID_GENERATOR.getAndIncrement();
+    CreateRequest.Builder request = CreateRequest.builder()
+      .setKey("key" + id)
+      .setName("Name " + id)
+      .setOrganization(organization != null ? organization.getKey() : null);
+    stream(populators).forEach(p -> p.accept(request));
+
+    return session.wsClient().projects().create(request.build()).getProject();
+  }
+}
diff --git a/it/it-tests/src/test/java/org/sonarqube/test/QProfileTester.java b/tests/src/test/java/org/sonarqube/tests/QProfileTester.java
index fc14a92b4a0..764b80d6955 100644
--- a/it/it-tests/src/test/java/org/sonarqube/test/QProfileTester.java
+++ b/tests/src/test/java/org/sonarqube/tests/QProfileTester.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarqube.test;
+package org.sonarqube.tests;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/it/it-tests/src/test/java/org/sonarqube/test/Session.java b/tests/src/test/java/org/sonarqube/tests/Session.java
index f99764468fc..6889f873b7e 100644
--- a/it/it-tests/src/test/java/org/sonarqube/test/Session.java
+++ b/tests/src/test/java/org/sonarqube/tests/Session.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarqube.test;
+package org.sonarqube.tests;
 
 import org.sonarqube.ws.client.WsClient;
 
@@ -29,6 +29,8 @@ public interface Session {
 
   OrganizationTester organizations();
 
+  ProjectTester projects();
+
   QProfileTester qProfiles();
 
   UserTester users();
diff --git a/it/it-tests/src/test/java/org/sonarqube/test/Tester.java b/tests/src/test/java/org/sonarqube/tests/Tester.java
index 9373e82abd9..f6a8f55162a 100644
--- a/it/it-tests/src/test/java/org/sonarqube/test/Tester.java
+++ b/tests/src/test/java/org/sonarqube/tests/Tester.java
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarqube.test;
+package org.sonarqube.tests;
 
 import com.sonar.orchestrator.Orchestrator;
 import javax.annotation.Nullable;
 import org.junit.rules.ExternalResource;
 import org.sonarqube.ws.client.WsClient;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.Navigation;
 import util.selenium.Selenese;
 
 import static util.ItUtils.newUserWsClient;
@@ -82,6 +82,7 @@ public class Tester extends ExternalResource implements Session {
       organizations().deleteNonGuardedOrganizations();
     }
     users().deleteAll();
+    projects().deleteAll();
   }
 
   public Session asAnonymous() {
@@ -146,6 +147,11 @@ public class Tester extends ExternalResource implements Session {
   }
 
   @Override
+  public ProjectTester projects() {
+    return rootSession.projects();
+  }
+
+  @Override
   public QProfileTester qProfiles() {
     return rootSession.qProfiles();
   }
@@ -178,6 +184,11 @@ public class Tester extends ExternalResource implements Session {
     }
 
     @Override
+    public ProjectTester projects() {
+      return new ProjectTester(this);
+    }
+
+    @Override
     public QProfileTester qProfiles() {
       return new QProfileTester(this);
     }
diff --git a/it/it-tests/src/test/java/org/sonarqube/test/UserTester.java b/tests/src/test/java/org/sonarqube/tests/UserTester.java
index baa2ed31b0b..9be2a5d512c 100644
--- a/it/it-tests/src/test/java/org/sonarqube/test/UserTester.java
+++ b/tests/src/test/java/org/sonarqube/tests/UserTester.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarqube.test;
+package org.sonarqube.tests;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/it/it-tests/src/test/java/it/analysis/ExtensionLifecycleTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/ExtensionLifecycleTest.java
index 07069cfdad6..09c9a18fdea 100644
--- a/it/it-tests/src/test/java/it/analysis/ExtensionLifecycleTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/ExtensionLifecycleTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysis;
+package org.sonarqube.tests.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
diff --git a/it/it-tests/src/test/java/it/analysis/FavoriteTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/FavoriteTest.java
index b0fc74c09e9..f94f6aa2833 100644
--- a/it/it-tests/src/test/java/it/analysis/FavoriteTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/FavoriteTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysis;
+package org.sonarqube.tests.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
diff --git a/it/it-tests/src/test/java/it/analysisExclusion/FileExclusionsTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/FileExclusionsTest.java
index c949f993240..c5e11147036 100644
--- a/it/it-tests/src/test/java/it/analysisExclusion/FileExclusionsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/FileExclusionsTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysisExclusion;
+package org.sonarqube.tests.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.util.List;
 import java.util.Map;
 import org.junit.Before;
diff --git a/it/it-tests/src/test/java/it/analysisExclusion/IssueExclusionsTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/IssueExclusionsTest.java
index 46292024bd5..615a5a2aeb6 100644
--- a/it/it-tests/src/test/java/it/analysisExclusion/IssueExclusionsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/IssueExclusionsTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysisExclusion;
+package org.sonarqube.tests.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.util.Map;
 import org.junit.Before;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/analysis/IssueJsonReportTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/IssueJsonReportTest.java
index 23c73d8c393..13ccd9ac4c5 100644
--- a/it/it-tests/src/test/java/it/analysis/IssueJsonReportTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/IssueJsonReportTest.java
@@ -17,14 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysis;
+package org.sonarqube.tests.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.locator.FileLocation;
 import com.sonar.orchestrator.locator.ResourceLocation;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
diff --git a/it/it-tests/src/test/java/it/analysis/IssuesModeTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/IssuesModeTest.java
index d2038ab073c..527f0970a7b 100644
--- a/it/it-tests/src/test/java/it/analysis/IssuesModeTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/IssuesModeTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysis;
+package org.sonarqube.tests.analysis;
 
 import com.google.common.collect.Maps;
 import com.sonar.orchestrator.Orchestrator;
@@ -27,7 +27,7 @@ import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.build.SonarScannerInstaller;
 import com.sonar.orchestrator.config.FileSystem;
 import com.sonar.orchestrator.version.Version;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import java.io.File;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
diff --git a/it/it-tests/src/test/java/it/analysis/LinksTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/LinksTest.java
index fe31968935b..eb14836b2c1 100644
--- a/it/it-tests/src/test/java/it/analysis/LinksTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/LinksTest.java
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysis;
+package org.sonarqube.tests.analysis;
 
 import com.google.common.collect.ImmutableMap;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import java.util.List;
 import java.util.Optional;
 import org.junit.After;
diff --git a/it/it-tests/src/test/java/it/analysis/MultiLanguageTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/MultiLanguageTest.java
index 5496c4e18ae..fa33ed7ea08 100644
--- a/it/it-tests/src/test/java/it/analysis/MultiLanguageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/MultiLanguageTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysis;
+package org.sonarqube.tests.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import java.util.Map;
 import org.junit.After;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/analysis/PermissionTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/PermissionTest.java
index 372865fa411..79663eec478 100644
--- a/it/it-tests/src/test/java/it/analysis/PermissionTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/PermissionTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysis;
+package org.sonarqube.tests.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import javax.annotation.Nullable;
 import org.junit.After;
 import org.junit.Before;
@@ -35,7 +35,6 @@ import org.sonarqube.ws.client.permission.AddUserWsRequest;
 import org.sonarqube.ws.client.usertoken.GenerateWsRequest;
 import org.sonarqube.ws.client.usertoken.RevokeWsRequest;
 import org.sonarqube.ws.client.usertoken.UserTokensService;
-import util.ItUtils;
 import util.user.UserRule;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -165,7 +164,7 @@ public class PermissionTest {
   }
 
   private SonarScanner configureScanner(String projectPath, String... props) {
-    return SonarScanner.create(ItUtils.projectDir(projectPath))
+    return SonarScanner.create(projectDir(projectPath))
       .setProperties(props);
   }
 
diff --git a/it/it-tests/src/test/java/it/analysis/ProjectBuilderTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/ProjectBuilderTest.java
index b6561ebf346..53b5a7059f9 100644
--- a/it/it-tests/src/test/java/it/analysis/ProjectBuilderTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/ProjectBuilderTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysis;
+package org.sonarqube.tests.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import java.util.Map;
 import org.junit.ClassRule;
 import org.junit.Test;
diff --git a/it/it-tests/src/test/java/it/analysis/ReportDumpTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/ReportDumpTest.java
index e6c46b4a8a2..952a6a057e6 100644
--- a/it/it-tests/src/test/java/it/analysis/ReportDumpTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/ReportDumpTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysis;
+package org.sonarqube.tests.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.http.HttpResponse;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/it/it-tests/src/test/java/it/analysis/SSLTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/SSLTest.java
index 97b40550297..be2f8804ae5 100644
--- a/it/it-tests/src/test/java/it/analysis/SSLTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/SSLTest.java
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysis;
+package org.sonarqube.tests.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.util.NetworkUtils;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import java.net.InetAddress;
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/it/it-tests/src/test/java/it/analysis/ScannerTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/ScannerTest.java
index 60baeecb9bd..a175bbf6294 100644
--- a/it/it-tests/src/test/java/it/analysis/ScannerTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/ScannerTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysis;
+package org.sonarqube.tests.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
diff --git a/it/it-tests/src/test/java/it/analysis/SettingsEncryptionTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/SettingsEncryptionTest.java
index 43768e309a2..8a530680550 100644
--- a/it/it-tests/src/test/java/it/analysis/SettingsEncryptionTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/SettingsEncryptionTest.java
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysis;
+package org.sonarqube.tests.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildFailureException;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import java.io.File;
 import java.net.URL;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/analysis/TempFolderTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/TempFolderTest.java
index 0af1543b3ed..9843ce5ce32 100644
--- a/it/it-tests/src/test/java/it/analysis/TempFolderTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/analysis/TempFolderTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.analysis;
+package org.sonarqube.tests.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import java.io.File;
 import java.io.IOException;
 import org.junit.Before;
diff --git a/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java b/tests/src/test/java/org/sonarqube/tests/authorisation/ExecuteAnalysisPermissionTest.java
index e315c731c44..65f1a52bce1 100644
--- a/it/it-tests/src/test/java/it/authorisation/ExecuteAnalysisPermissionTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/authorisation/ExecuteAnalysisPermissionTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.authorisation;
+package org.sonarqube.tests.authorisation;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildFailureException;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -33,7 +33,6 @@ import org.sonarqube.ws.client.permission.AddGroupWsRequest;
 import org.sonarqube.ws.client.permission.AddProjectCreatorToTemplateWsRequest;
 import org.sonarqube.ws.client.permission.RemoveGroupWsRequest;
 import org.sonarqube.ws.client.project.UpdateVisibilityRequest;
-import util.ItUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
@@ -84,7 +83,7 @@ public class ExecuteAnalysisPermissionTest {
         "You're only authorized to execute a local (preview) SonarQube analysis without pushing the results to the SonarQube server. Please contact your SonarQube administrator.");
     }
 
-    ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(UpdateVisibilityRequest.builder().setProject(PROJECT_KEY).setVisibility("private").build());
+    newAdminWsClient(orchestrator).projects().updateVisibility(UpdateVisibilityRequest.builder().setProject(PROJECT_KEY).setVisibility("private").build());
     try {
       // Execute anonymous analysis
       executeAnonymousAnalysis();
@@ -101,7 +100,7 @@ public class ExecuteAnalysisPermissionTest {
     executeAnonymousAnalysis();
 
     // make project private
-    ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(UpdateVisibilityRequest.builder().setProject("sample").setVisibility("private").build());
+    newAdminWsClient(orchestrator).projects().updateVisibility(UpdateVisibilityRequest.builder().setProject("sample").setVisibility("private").build());
 
     // still no error
     executeAnonymousAnalysis();
diff --git a/it/it-tests/src/test/java/it/authorisation/IssuePermissionTest.java b/tests/src/test/java/org/sonarqube/tests/authorisation/IssuePermissionTest.java
index 61cc647c47a..21f39e7d636 100644
--- a/it/it-tests/src/test/java/it/authorisation/IssuePermissionTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/authorisation/IssuePermissionTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.authorisation;
+package org.sonarqube.tests.authorisation;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -57,7 +57,7 @@ public class IssuePermissionTest {
     ItUtils.restoreProfile(orchestrator, getClass().getResource("/authorisation/one-issue-per-line-profile.xml"));
 
     orchestrator.getServer().provisionProject("privateProject", "PrivateProject");
-    ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(UpdateVisibilityRequest.builder().setProject("privateProject").setVisibility("private").build());
+    newAdminWsClient(orchestrator).projects().updateVisibility(UpdateVisibilityRequest.builder().setProject("privateProject").setVisibility("private").build());
     orchestrator.getServer().associateProjectToQualityProfile("privateProject", "xoo", "one-issue-per-line");
     SonarScanner privateProject = SonarScanner.create(projectDir("shared/xoo-sample"))
       .setProperty("sonar.projectKey", "privateProject")
diff --git a/it/it-tests/src/test/java/it/authorisation/PermissionSearchTest.java b/tests/src/test/java/org/sonarqube/tests/authorisation/PermissionSearchTest.java
index 8b91e3777e5..7698aa3bb8e 100644
--- a/it/it-tests/src/test/java/it/authorisation/PermissionSearchTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/authorisation/PermissionSearchTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.authorisation;
+package org.sonarqube.tests.authorisation;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/authorisation/PermissionTemplatesPageTest.java b/tests/src/test/java/org/sonarqube/tests/authorisation/PermissionTemplatesPageTest.java
index 568c5302da8..f94a50bb0b3 100644
--- a/it/it-tests/src/test/java/it/authorisation/PermissionTemplatesPageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/authorisation/PermissionTemplatesPageTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.authorisation;
+package org.sonarqube.tests.authorisation;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.ClassRule;
 import org.junit.Test;
 
diff --git a/it/it-tests/src/test/java/it/authorisation/ProvisioningPermissionTest.java b/tests/src/test/java/org/sonarqube/tests/authorisation/ProvisioningPermissionTest.java
index 17b91aca415..8d3b7ac007a 100644
--- a/it/it-tests/src/test/java/it/authorisation/ProvisioningPermissionTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/authorisation/ProvisioningPermissionTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.authorisation;
+package org.sonarqube.tests.authorisation;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/authorisation/QualityProfileAdminPermissionTest.java b/tests/src/test/java/org/sonarqube/tests/authorisation/QualityProfileAdminPermissionTest.java
index 2afa6a4e07f..65193eb1bee 100644
--- a/it/it-tests/src/test/java/it/authorisation/QualityProfileAdminPermissionTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/authorisation/QualityProfileAdminPermissionTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.authorisation;
+package org.sonarqube.tests.authorisation;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/ce/CeWsTest.java b/tests/src/test/java/org/sonarqube/tests/ce/CeWsTest.java
index 29445245618..e6faf6ec58c 100644
--- a/it/it-tests/src/test/java/it/ce/CeWsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/ce/CeWsTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.ce;
+package org.sonarqube.tests.ce;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
diff --git a/it/it-tests/src/test/java/it/complexity/ComplexityMeasuresTest.java b/tests/src/test/java/org/sonarqube/tests/complexity/ComplexityMeasuresTest.java
index ce192047f07..3eb28da0ccc 100644
--- a/it/it-tests/src/test/java/it/complexity/ComplexityMeasuresTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/complexity/ComplexityMeasuresTest.java
@@ -17,17 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.complexity;
+package org.sonarqube.tests.complexity;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Java6Assertions.entry;
+import static org.assertj.core.api.Assertions.entry;
 import static util.ItUtils.getMeasuresAsDoubleByMetricKey;
 import static util.ItUtils.projectDir;
 
diff --git a/it/it-tests/src/test/java/it/component/ComponentsWsTest.java b/tests/src/test/java/org/sonarqube/tests/component/ComponentsWsTest.java
index 4820f670cf8..69cae2a8d34 100644
--- a/it/it-tests/src/test/java/it/component/ComponentsWsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/component/ComponentsWsTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.component;
+package org.sonarqube.tests.component;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
diff --git a/it/it-tests/src/test/java/it/component/ProjectsWsTest.java b/tests/src/test/java/org/sonarqube/tests/component/ProjectsWsTest.java
index a8f760178d9..75d5f5bae16 100644
--- a/it/it-tests/src/test/java/it/component/ProjectsWsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/component/ProjectsWsTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.component;
+package org.sonarqube.tests.component;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.io.IOException;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpResponse;
diff --git a/it/it-tests/src/test/java/it/customMeasure/CustomMeasuresTest.java b/tests/src/test/java/org/sonarqube/tests/customMeasure/CustomMeasuresTest.java
index f7c1149fefb..206f3eb35dd 100644
--- a/it/it-tests/src/test/java/it/customMeasure/CustomMeasuresTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/customMeasure/CustomMeasuresTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.customMeasure;
+package org.sonarqube.tests.customMeasure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.junit.Before;
diff --git a/it/it-tests/src/test/java/it/dbCleaner/PurgeTest.java b/tests/src/test/java/org/sonarqube/tests/dbCleaner/PurgeTest.java
index 5c5b450dced..dc4bb0fcc78 100644
--- a/it/it-tests/src/test/java/it/dbCleaner/PurgeTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/dbCleaner/PurgeTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.dbCleaner;
+package org.sonarqube.tests.dbCleaner;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
diff --git a/it/it-tests/src/test/java/it/duplication/CrossModuleDuplicationsTest.java b/tests/src/test/java/org/sonarqube/tests/duplication/CrossModuleDuplicationsTest.java
index b88e5d64982..a4588635e37 100644
--- a/it/it-tests/src/test/java/it/duplication/CrossModuleDuplicationsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/duplication/CrossModuleDuplicationsTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.duplication;
+package org.sonarqube.tests.duplication;
 
 import com.google.common.collect.ImmutableMap;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
diff --git a/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsOnRemoveFileTest.java b/tests/src/test/java/org/sonarqube/tests/duplication/CrossProjectDuplicationsOnRemoveFileTest.java
index f43cdeda5cb..8813c2cb053 100644
--- a/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsOnRemoveFileTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/duplication/CrossProjectDuplicationsOnRemoveFileTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.duplication;
+package org.sonarqube.tests.duplication;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import org.apache.commons.io.IOUtils;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsTest.java b/tests/src/test/java/org/sonarqube/tests/duplication/CrossProjectDuplicationsTest.java
index 9e9529cba7a..81708b22d2c 100644
--- a/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/duplication/CrossProjectDuplicationsTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.duplication;
+package org.sonarqube.tests.duplication;
 
 import com.google.common.collect.ObjectArrays;
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.util.Map;
 import org.apache.commons.io.IOUtils;
 import org.junit.AfterClass;
diff --git a/it/it-tests/src/test/java/it/duplication/DuplicationsTest.java b/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationsTest.java
index 6eddcee5915..710fd8de0d5 100644
--- a/it/it-tests/src/test/java/it/duplication/DuplicationsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationsTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.duplication;
+package org.sonarqube.tests.duplication;
 
 import com.google.common.collect.ObjectArrays;
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.util.Map;
 import org.apache.commons.io.IOUtils;
 import org.junit.AfterClass;
diff --git a/it/it-tests/src/test/java/it/duplication/NewDuplicationsTest.java b/tests/src/test/java/org/sonarqube/tests/duplication/NewDuplicationsTest.java
index e3dfa701dc4..c16b3441f5d 100644
--- a/it/it-tests/src/test/java/it/duplication/NewDuplicationsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/duplication/NewDuplicationsTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.duplication;
+package org.sonarqube.tests.duplication;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.util.Map;
 import org.assertj.core.data.Offset;
 import org.junit.BeforeClass;
diff --git a/it/it-tests/src/test/java/it/i18n/I18nTest.java b/tests/src/test/java/org/sonarqube/tests/i18n/I18nTest.java
index fad347688f5..29b3580e0eb 100644
--- a/it/it-tests/src/test/java/it/i18n/I18nTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/i18n/I18nTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.i18n;
+package org.sonarqube.tests.i18n;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Ignore;
diff --git a/it/it-tests/src/test/java/it/issue/AbstractIssueTest.java b/tests/src/test/java/org/sonarqube/tests/issue/AbstractIssueTest.java
index 55ddc987572..4f85822c7d6 100644
--- a/it/it-tests/src/test/java/it/issue/AbstractIssueTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/AbstractIssueTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import java.util.List;
 import org.junit.ClassRule;
 import org.sonar.wsclient.issue.Issue;
diff --git a/it/it-tests/src/test/java/it/issue/AutoAssignTest.java b/tests/src/test/java/org/sonarqube/tests/issue/AutoAssignTest.java
index 6110c02f245..7b6f2caf80a 100644
--- a/it/it-tests/src/test/java/it/issue/AutoAssignTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/AutoAssignTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/it/it-tests/src/test/java/it/issue/CommonRulesTest.java b/tests/src/test/java/org/sonarqube/tests/issue/CommonRulesTest.java
index c9c7635949f..69cddb89b7a 100644
--- a/it/it-tests/src/test/java/it/issue/CommonRulesTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/CommonRulesTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.util.List;
 import org.junit.BeforeClass;
diff --git a/it/it-tests/src/test/java/it/issue/CustomRulesTest.java b/tests/src/test/java/org/sonarqube/tests/issue/CustomRulesTest.java
index e8423ccf603..cae6130cea6 100644
--- a/it/it-tests/src/test/java/it/issue/CustomRulesTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/CustomRulesTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.util.List;
 import org.junit.Before;
diff --git a/it/it-tests/src/test/java/it/issue/IssueActionTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueActionTest.java
index 0006ac98646..6ef4ae9573e 100644
--- a/it/it-tests/src/test/java/it/issue/IssueActionTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueActionTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.util.List;
 import org.junit.Before;
diff --git a/it/it-tests/src/test/java/it/issue/IssueBulkChangeTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueBulkChangeTest.java
index bbb4192e4c9..b62cf49a22c 100644
--- a/it/it-tests/src/test/java/it/issue/IssueBulkChangeTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueBulkChangeTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import com.google.common.collect.FluentIterable;
 import java.util.List;
diff --git a/it/it-tests/src/test/java/it/issue/IssueChangelogTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueChangelogTest.java
index d9c833e9a41..d96536d1bd1 100644
--- a/it/it-tests/src/test/java/it/issue/IssueChangelogTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueChangelogTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.util.List;
 import org.junit.Before;
diff --git a/it/it-tests/src/test/java/it/issue/IssueCreationDateTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDateTest.java
index 0dd27ca82fd..47ce6e5ac9f 100644
--- a/it/it-tests/src/test/java/it/issue/IssueCreationDateTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDateTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.container.Server;
diff --git a/it/it-tests/src/test/java/it/issue/IssueCreationTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationTest.java
index 7f7a819a3b1..b6afaf17304 100644
--- a/it/it-tests/src/test/java/it/issue/IssueCreationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import org.junit.Before;
 import org.junit.Test;
diff --git a/it/it-tests/src/test/java/it/issue/IssueFilterExtensionTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterExtensionTest.java
index 3232a6c0720..7dc46462f63 100644
--- a/it/it-tests/src/test/java/it/issue/IssueFilterExtensionTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterExtensionTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.util.List;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/issue/IssueFilterOnCommonRulesTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterOnCommonRulesTest.java
index 0c2e5a48f98..8012aec2ef7 100644
--- a/it/it-tests/src/test/java/it/issue/IssueFilterOnCommonRulesTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterOnCommonRulesTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.util.List;
 import org.apache.commons.lang.ArrayUtils;
diff --git a/it/it-tests/src/test/java/it/issue/IssueFilterTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterTest.java
index 1e848f6d55c..bc906d6093d 100644
--- a/it/it-tests/src/test/java/it/issue/IssueFilterTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.util.Map;
 import org.junit.Before;
diff --git a/it/it-tests/src/test/java/it/issue/IssueMeasureTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueMeasureTest.java
index 47860b72875..8b91bb76477 100644
--- a/it/it-tests/src/test/java/it/issue/IssueMeasureTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueMeasureTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.util.List;
 import java.util.Map;
diff --git a/it/it-tests/src/test/java/it/issue/IssueNotificationsTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java
index a77a85b7bd3..49e4cee8afc 100644
--- a/it/it-tests/src/test/java/it/issue/IssueNotificationsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.util.Iterator;
 import javax.mail.internet.MimeMessage;
diff --git a/it/it-tests/src/test/java/it/issue/IssuePurgeTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssuePurgeTest.java
index c230d918e67..63a033713ac 100644
--- a/it/it-tests/src/test/java/it/issue/IssuePurgeTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssuePurgeTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.util.List;
 import org.junit.Before;
diff --git a/it/it-tests/src/test/java/it/issue/IssueSearchTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java
index a0fd5dd81c3..1ad0be32cd9 100644
--- a/it/it-tests/src/test/java/it/issue/IssueSearchTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.io.IOException;
 import java.text.SimpleDateFormat;
diff --git a/it/it-tests/src/test/java/it/issue/IssueTagsTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueTagsTest.java
index f5563924b6d..aa1f987c565 100644
--- a/it/it-tests/src/test/java/it/issue/IssueTagsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueTagsTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -29,7 +29,7 @@ import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Organizations.Organization;
 import org.sonarqube.ws.WsUsers.CreateWsResponse.User;
 import org.sonarqube.ws.client.issue.SearchWsRequest;
diff --git a/it/it-tests/src/test/java/it/issue/IssueTrackingTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueTrackingTest.java
index a1e2e89ad11..27a9ed0e80f 100644
--- a/it/it-tests/src/test/java/it/issue/IssueTrackingTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueTrackingTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/it/it-tests/src/test/java/it/issue/IssueWorkflowTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueWorkflowTest.java
index a0e366792cf..bfcd4afca84 100644
--- a/it/it-tests/src/test/java/it/issue/IssueWorkflowTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueWorkflowTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import java.util.List;
 import org.junit.Before;
diff --git a/it/it-tests/src/test/java/it/issue/IssuesPageTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssuesPageTest.java
index 3af55ed447f..cc3829b78e2 100644
--- a/it/it-tests/src/test/java/it/issue/IssuesPageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/IssuesPageTest.java
@@ -17,18 +17,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import pageobjects.Navigation;
-import pageobjects.issues.Issue;
-import pageobjects.issues.IssuesPage;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.issues.Issue;
+import org.sonarqube.pageobjects.issues.IssuesPage;
 import util.ItUtils;
 import util.user.UserRule;
 
diff --git a/it/it-tests/src/test/java/it/issue/NewIssuesMeasureTest.java b/tests/src/test/java/org/sonarqube/tests/issue/NewIssuesMeasureTest.java
index f5f409cb87d..40a5de1ab18 100644
--- a/it/it-tests/src/test/java/it/issue/NewIssuesMeasureTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/NewIssuesMeasureTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import com.sonar.orchestrator.build.SonarScanner;
 import java.util.Map;
diff --git a/it/it-tests/src/test/java/it/issue/OrganizationIssueAssignTest.java b/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueAssignTest.java
index ffe6ac715f3..436e466454d 100644
--- a/it/it-tests/src/test/java/it/issue/OrganizationIssueAssignTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueAssignTest.java
@@ -18,17 +18,17 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package it.issue;
+package org.sonarqube.tests.issue;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Issues;
 import org.sonarqube.ws.Issues.Issue;
 import org.sonarqube.ws.Organizations;
@@ -38,7 +38,7 @@ import org.sonarqube.ws.client.issue.BulkChangeRequest;
 import org.sonarqube.ws.client.issue.SearchWsRequest;
 import org.sonarqube.ws.client.project.CreateRequest;
 import org.sonarqube.ws.client.qualityprofile.AddProjectRequest;
-import pageobjects.issues.IssuesPage;
+import org.sonarqube.pageobjects.issues.IssuesPage;
 import util.issue.IssueRule;
 
 import static java.lang.String.format;
diff --git a/it/it-tests/src/test/java/it/issueFilter/ToDoTest.java b/tests/src/test/java/org/sonarqube/tests/issueFilter/ToDoTest.java
index eea805f8902..9b49441ec18 100644
--- a/it/it-tests/src/test/java/it/issueFilter/ToDoTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/issueFilter/ToDoTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.issueFilter;
+package org.sonarqube.tests.issueFilter;
 
 public class ToDoTest {
 }
diff --git a/it/it-tests/src/test/java/it/LiteSuite.java b/tests/src/test/java/org/sonarqube/tests/lite/LiteSuite.java
index b87d374c60a..b362cd9dfb3 100644
--- a/it/it-tests/src/test/java/it/LiteSuite.java
+++ b/tests/src/test/java/org/sonarqube/tests/lite/LiteSuite.java
@@ -17,9 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it;
+package org.sonarqube.tests.lite;
 
-import it.lite.LiteTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/it/it-tests/src/test/java/it/lite/LiteTest.java b/tests/src/test/java/org/sonarqube/tests/lite/LiteTest.java
index 1537c8af6c3..e60adfdbc2b 100644
--- a/it/it-tests/src/test/java/it/lite/LiteTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/lite/LiteTest.java
@@ -17,14 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.lite;
+package org.sonarqube.tests.lite;
 
 import com.sonar.orchestrator.Orchestrator;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
-import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.junit.rules.RuleChain;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Issues;
 import org.sonarqube.ws.WsComponents;
 import org.sonarqube.ws.WsMeasures;
@@ -45,15 +45,16 @@ public class LiteTest {
 
   private static final String PROJECT_KEY = "com.sonarsource.it.samples:multi-modules-sample";
 
-  @ClassRule
-  public static Orchestrator orchestrator = Orchestrator.builderEnv()
+  private static Orchestrator orchestrator = Orchestrator.builderEnv()
     .setOrchestratorProperty("sonar.web.context", "/sonarqube")
     .addPlugin(xooPlugin())
     .build();
 
-  @Rule
-  public Tester tester = new Tester(orchestrator)
-    .disableOrganizations();
+  private static Tester tester = new Tester(orchestrator);
+
+  @ClassRule
+  public static RuleChain ruleChain = RuleChain.outerRule(orchestrator)
+    .around(tester);
 
   @BeforeClass
   public static void setUp() {
diff --git a/it/it-tests/src/test/java/it/measure/DecimalScaleMetricTest.java b/tests/src/test/java/org/sonarqube/tests/measure/DecimalScaleMetricTest.java
index 6671cb30611..448c9554402 100644
--- a/it/it-tests/src/test/java/it/measure/DecimalScaleMetricTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/measure/DecimalScaleMetricTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.measure;
+package org.sonarqube.tests.measure;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import org.junit.ClassRule;
 import org.junit.Test;
 import util.ItUtils;
diff --git a/it/it-tests/src/test/java/it/measureHistory/DifferentialPeriodsTest.java b/tests/src/test/java/org/sonarqube/tests/measure/DifferentialPeriodsTest.java
index 03f40dc23d8..0597e0e8e97 100644
--- a/it/it-tests/src/test/java/it/measureHistory/DifferentialPeriodsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/measure/DifferentialPeriodsTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.measureHistory;
+package org.sonarqube.tests.measure;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.util.Date;
 import org.junit.After;
 import org.junit.Before;
@@ -29,7 +29,7 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonarqube.ws.client.WsClient;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.Navigation;
 import util.ItUtils;
 import util.user.UserRule;
 
@@ -90,7 +90,7 @@ public class DifferentialPeriodsTest {
     runProjectAnalysis(orchestrator, "shared/xoo-sample", "sonar.projectDate", formatDate(addDays(new Date(), -15)));
 
     // Second analysis -> issues will be created
-    ItUtils.restoreProfile(orchestrator, getClass().getResource("/measureHistory/one-issue-per-line-profile.xml"));
+    ItUtils.restoreProfile(orchestrator, getClass().getResource("/measure/one-issue-per-line-profile.xml"));
     orchestrator.getServer().associateProjectToQualityProfile(PROJECT_KEY, "xoo", "one-issue-per-line");
     runProjectAnalysis(orchestrator, "shared/xoo-sample");
 
@@ -120,7 +120,7 @@ public class DifferentialPeriodsTest {
       "sonar.modules", "module_a");
 
     // Second analysis, 20 days ago, issues will be created
-    ItUtils.restoreProfile(orchestrator, getClass().getResource("/measureHistory/one-issue-per-line-profile.xml"));
+    ItUtils.restoreProfile(orchestrator, getClass().getResource("/measure/one-issue-per-line-profile.xml"));
     orchestrator.getServer().associateProjectToQualityProfile(MULTI_MODULE_PROJECT_KEY, "xoo", "one-issue-per-line");
     runProjectAnalysis(orchestrator, "shared/xoo-multi-modules-sample",
       "sonar.projectDate", formatDate(addDays(new Date(), -20)),
@@ -142,7 +142,7 @@ public class DifferentialPeriodsTest {
       "sonar.modules", "module_a");
 
     // Second analysis, 20 days ago
-    ItUtils.restoreProfile(orchestrator, getClass().getResource("/measureHistory/one-issue-per-line-profile.xml"));
+    ItUtils.restoreProfile(orchestrator, getClass().getResource("/measure/one-issue-per-line-profile.xml"));
     orchestrator.getServer().associateProjectToQualityProfile(MULTI_MODULE_PROJECT_KEY, "xoo", "one-issue-per-line");
     runProjectAnalysis(orchestrator, "shared/xoo-multi-modules-sample",
       "sonar.projectDate", formatDate(addDays(new Date(), -20)),
diff --git a/it/it-tests/src/test/java/it/measure/MeasuresWsTest.java b/tests/src/test/java/org/sonarqube/tests/measure/MeasuresWsTest.java
index f30c4d66003..53e20f39bc0 100644
--- a/it/it-tests/src/test/java/it/measure/MeasuresWsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/measure/MeasuresWsTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.measure;
+package org.sonarqube.tests.measure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.util.List;
 import org.junit.AfterClass;
 import org.junit.Before;
diff --git a/it/it-tests/src/test/java/it/measure/ProjectDashboardTest.java b/tests/src/test/java/org/sonarqube/tests/measure/ProjectDashboardTest.java
index b0054d9d3af..584938877da 100644
--- a/it/it-tests/src/test/java/it/measure/ProjectDashboardTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/measure/ProjectDashboardTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.measure;
+package org.sonarqube.tests.measure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Ignore;
@@ -30,8 +30,8 @@ import org.junit.Test;
 import org.openqa.selenium.Keys;
 import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.WsClient;
-import pageobjects.Navigation;
-import pageobjects.ProjectDashboardPage;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.ProjectDashboardPage;
 import util.user.UserRule;
 
 import static com.codeborne.selenide.Condition.hasText;
diff --git a/it/it-tests/src/test/java/it/measure/ProjectMeasuresPageTest.java b/tests/src/test/java/org/sonarqube/tests/measure/ProjectMeasuresPageTest.java
index 8c83f7bc3a8..46ee9aafd11 100644
--- a/it/it-tests/src/test/java/it/measure/ProjectMeasuresPageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/measure/ProjectMeasuresPageTest.java
@@ -17,15 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.measure;
+package org.sonarqube.tests.measure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.Navigation;
 
 import static com.codeborne.selenide.Condition.visible;
 import static com.codeborne.selenide.Selenide.$;
diff --git a/it/it-tests/src/test/java/it/measureHistory/SincePreviousVersionHistoryTest.java b/tests/src/test/java/org/sonarqube/tests/measure/SincePreviousVersionHistoryTest.java
index 888072186ef..5dd7e15ca23 100644
--- a/it/it-tests/src/test/java/it/measureHistory/SincePreviousVersionHistoryTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/measure/SincePreviousVersionHistoryTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.measureHistory;
+package org.sonarqube.tests.measure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import javax.annotation.Nullable;
diff --git a/it/it-tests/src/test/java/it/measureHistory/SinceXDaysHistoryTest.java b/tests/src/test/java/org/sonarqube/tests/measure/SinceXDaysHistoryTest.java
index 1c53d3df87c..b37942b817e 100644
--- a/it/it-tests/src/test/java/it/measureHistory/SinceXDaysHistoryTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/measure/SinceXDaysHistoryTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.measureHistory;
+package org.sonarqube.tests.measure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import javax.annotation.Nullable;
@@ -51,7 +51,7 @@ public class SinceXDaysHistoryTest {
     initPeriod();
 
     orchestrator.resetData();
-    ItUtils.restoreProfile(orchestrator, SinceXDaysHistoryTest.class.getResource("/measureHistory/one-issue-per-line-profile.xml"));
+    ItUtils.restoreProfile(orchestrator, SinceXDaysHistoryTest.class.getResource("/measure/one-issue-per-line-profile.xml"));
     orchestrator.getServer().provisionProject(PROJECT, PROJECT);
     orchestrator.getServer().associateProjectToQualityProfile(PROJECT, "xoo", "one-issue-per-line");
 
diff --git a/it/it-tests/src/test/java/it/measureHistory/TimeMachineTest.java b/tests/src/test/java/org/sonarqube/tests/measure/TimeMachineTest.java
index 56d4ad6ae92..90dbd6f9009 100644
--- a/it/it-tests/src/test/java/it/measureHistory/TimeMachineTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/measure/TimeMachineTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.measureHistory;
+package org.sonarqube.tests.measure;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Map;
@@ -62,7 +62,7 @@ public class TimeMachineTest {
   public static void initialize() {
     orchestrator.resetData();
     initPeriod();
-    ItUtils.restoreProfile(orchestrator, TimeMachineTest.class.getResource("/measureHistory/one-issue-per-line-profile.xml"));
+    ItUtils.restoreProfile(orchestrator, TimeMachineTest.class.getResource("/measure/one-issue-per-line-profile.xml"));
     orchestrator.getServer().provisionProject("sample", "Sample");
     orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-issue-per-line");
     analyzeProject("measure/xoo-history-v1", FIRST_ANALYSIS_DATE);
diff --git a/it/it-tests/src/test/java/it/organization/BillingTest.java b/tests/src/test/java/org/sonarqube/tests/organization/BillingTest.java
index 975db8b260e..22d209954e3 100644
--- a/it/it-tests/src/test/java/it/organization/BillingTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/organization/BillingTest.java
@@ -17,18 +17,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.organization;
+package org.sonarqube.tests.organization;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Organizations;
 import org.sonarqube.ws.WsUsers.CreateWsResponse.User;
 import org.sonarqube.ws.client.GetRequest;
@@ -36,15 +36,14 @@ import org.sonarqube.ws.client.WsResponse;
 import org.sonarqube.ws.client.organization.UpdateProjectVisibilityWsRequest;
 import org.sonarqube.ws.client.project.CreateRequest;
 import org.sonarqube.ws.client.project.UpdateVisibilityRequest;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.Navigation;
 import util.ItUtils;
 
 import static java.lang.String.format;
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonarqube.ws.WsCe.TaskResponse;
 import static util.ItUtils.expectHttpError;
 import static util.ItUtils.newProjectKey;
-import static util.ItUtils.newUserWsClient;
 import static util.ItUtils.projectDir;
 import static util.ItUtils.resetSettings;
 import static util.ItUtils.setServerProperty;
@@ -215,14 +214,7 @@ public class BillingTest {
   }
 
   private String createPublicProject() {
-    String projectKey = newProjectKey();
-    tester.wsClient().projects().create(CreateRequest.builder()
-      .setKey(projectKey)
-      .setName(projectKey)
-      .setOrganization(organization.getKey())
-      .setVisibility("public")
-      .build());
-    return projectKey;
+    return tester.projects().generate(organization).getKey();
   }
 
   private String executeAnalysis(String projectKey) {
@@ -240,7 +232,7 @@ public class BillingTest {
   }
 
   private void assertWsResponseAsUser(GetRequest request, String expectedContent, User user) {
-    WsResponse response = newUserWsClient(orchestrator, user.getLogin(), user.getLogin()).wsConnector().call(request).failIfNotSuccessful();
+    WsResponse response = tester.as(user.getLogin()).wsClient().wsConnector().call(request).failIfNotSuccessful();
     assertThat(response.content()).contains(expectedContent);
   }
 }
diff --git a/it/it-tests/src/test/java/it/organization/OrganizationMembershipTest.java b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationMembershipTest.java
index 3f71e96d99e..256b30b7271 100644
--- a/it/it-tests/src/test/java/it/organization/OrganizationMembershipTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationMembershipTest.java
@@ -18,17 +18,17 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package it.organization;
+package org.sonarqube.tests.organization;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Organizations.Organization;
 import org.sonarqube.ws.WsUsers.CreateWsResponse.User;
 import org.sonarqube.ws.client.HttpException;
diff --git a/it/it-tests/src/test/java/it/organization/OrganizationMembershipUiTest.java b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationMembershipUiTest.java
index 8f39de54af8..eb6b6bb639e 100644
--- a/it/it-tests/src/test/java/it/organization/OrganizationMembershipUiTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationMembershipUiTest.java
@@ -18,20 +18,20 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package it.organization;
+package org.sonarqube.tests.organization;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.OrganizationTester;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.OrganizationTester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Organizations.Organization;
 import org.sonarqube.ws.WsUsers.CreateWsResponse.User;
-import pageobjects.organization.MembersPage;
+import org.sonarqube.pageobjects.organization.MembersPage;
 
 import static util.ItUtils.setServerProperty;
 
diff --git a/it/it-tests/src/test/java/it/organization/OrganizationTest.java b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java
index fcde79399e2..7ea671d5928 100644
--- a/it/it-tests/src/test/java/it/organization/OrganizationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.organization;
+package org.sonarqube.tests.organization;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildFailureException;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import java.util.List;
 import java.util.Locale;
 import org.junit.After;
@@ -29,8 +29,8 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.sonarqube.test.OrganizationTester;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.OrganizationTester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Organizations.Organization;
 import org.sonarqube.ws.QualityProfiles;
 import org.sonarqube.ws.Rules;
@@ -53,9 +53,6 @@ import static util.ItUtils.expectBadRequestError;
 import static util.ItUtils.expectForbiddenError;
 import static util.ItUtils.expectNotFoundError;
 import static util.ItUtils.expectUnauthorizedError;
-import static util.ItUtils.newAdminWsClient;
-import static util.ItUtils.newUserWsClient;
-import static util.ItUtils.newWsClient;
 import static util.ItUtils.runProjectAnalysis;
 import static util.ItUtils.setServerProperty;
 
@@ -212,7 +209,7 @@ public class OrganizationTest {
       "sonar.organization", organization.getKey(),
       "sonar.login", user.getLogin(),
       "sonar.password", user.getLogin());
-    ComponentsService componentsService = newUserWsClient(orchestrator, user.getLogin(), user.getLogin()).components();
+    ComponentsService componentsService = tester.as(user.getLogin()).wsClient().components();
     assertThat(searchSampleProject(organization.getKey(), componentsService).getComponentsList()).hasSize(1);
   }
 
@@ -228,7 +225,7 @@ public class OrganizationTest {
       assertThat(e.getResult().getLogs()).contains("Insufficient privileges");
     }
 
-    ComponentsService componentsService = newAdminWsClient(orchestrator).components();
+    ComponentsService componentsService = tester.wsClient().components();
     assertThat(searchSampleProject(organization.getKey(), componentsService).getComponentsCount()).isEqualTo(0);
   }
 
@@ -238,12 +235,12 @@ public class OrganizationTest {
 
     runProjectAnalysis(orchestrator, "shared/xoo-sample", "sonar.organization", organization.getKey(), "sonar.login", "admin", "sonar.password", "admin");
 
-    ComponentsService componentsService = newWsClient(orchestrator).components();
+    ComponentsService componentsService = tester.asAnonymous().wsClient().components();
     assertThat(searchSampleProject(organization.getKey(), componentsService).getComponentsList()).hasSize(1);
   }
 
   private void addPermissionsToUser(String orgKeyAndName, String login, String permission, String... otherPermissions) {
-    PermissionsService permissionsService = newAdminWsClient(orchestrator).permissions();
+    PermissionsService permissionsService = tester.wsClient().permissions();
     permissionsService.addUser(new AddUserWsRequest().setLogin(login).setOrganization(orgKeyAndName).setPermission(permission));
     for (String otherPermission : otherPermissions) {
       permissionsService.addUser(new AddUserWsRequest().setLogin(login).setOrganization(orgKeyAndName).setPermission(otherPermission));
diff --git a/it/it-tests/src/test/java/it/organization/PersonalOrganizationTest.java b/tests/src/test/java/org/sonarqube/tests/organization/PersonalOrganizationTest.java
index 76bf2f9eec3..5f6320c6397 100644
--- a/it/it-tests/src/test/java/it/organization/PersonalOrganizationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/organization/PersonalOrganizationTest.java
@@ -18,17 +18,17 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package it.organization;
+package org.sonarqube.tests.organization;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import java.util.List;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Organizations;
 import org.sonarqube.ws.WsUsers;
 import org.sonarqube.ws.client.organization.SearchWsRequest;
diff --git a/it/it-tests/src/test/java/it/organization/RootUserOnOrganizationTest.java b/tests/src/test/java/org/sonarqube/tests/organization/RootUserOnOrganizationTest.java
index 75c66ba02df..e462fb709c5 100644
--- a/it/it-tests/src/test/java/it/organization/RootUserOnOrganizationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/organization/RootUserOnOrganizationTest.java
@@ -17,16 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.organization;
+package org.sonarqube.tests.organization;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import java.sql.SQLException;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Session;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Session;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.WsRoot;
 import org.sonarqube.ws.WsUsers;
 import util.user.UserRule;
diff --git a/it/it-tests/src/test/java/it/organization/RootUserTest.java b/tests/src/test/java/org/sonarqube/tests/organization/RootUserTest.java
index c8bdc4c8b0b..517fc94d0f1 100644
--- a/it/it-tests/src/test/java/it/organization/RootUserTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/organization/RootUserTest.java
@@ -17,14 +17,14 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.organization;
+package org.sonarqube.tests.organization;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 
 import static util.ItUtils.expectForbiddenError;
 
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/PerfTestCase.java b/tests/src/test/java/org/sonarqube/tests/performance/AbstractPerfTest.java
index 9a6ffa44fa0..2cb2519fdc4 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/PerfTestCase.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/AbstractPerfTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf;
+package org.sonarqube.tests.performance;
 
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.locator.FileLocation;
@@ -32,9 +32,9 @@ import org.junit.Rule;
 import org.junit.rules.ErrorCollector;
 import org.junit.rules.TestName;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
-public abstract class PerfTestCase {
+public abstract class AbstractPerfTest {
   static final double ACCEPTED_DURATION_VARIATION_IN_PERCENTS = 8.0;
 
   @Rule
@@ -98,7 +98,7 @@ public abstract class PerfTestCase {
     scanner
       .setEnvironmentVariable("SONAR_RUNNER_OPTS", sonarRunnerOpts)
       .setEnvironmentVariable("SONAR_SCANNER_OPTS", sonarRunnerOpts)
-      .setProjectDir(FileLocation.of("projects/xoo-sample").getFile());
+      .setProjectDir(FileLocation.of("projects/performance/xoo-sample").getFile());
     return scanner;
   }
 }
diff --git a/tests/perf/src/main/java/org/sonarsource/sonarqube/perf/MavenLogs.java b/tests/src/test/java/org/sonarqube/tests/performance/MavenLogs.java
index 25f7718b58e..ee9cc7a5c80 100644
--- a/tests/perf/src/main/java/org/sonarsource/sonarqube/perf/MavenLogs.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/MavenLogs.java
@@ -17,13 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf;
+package org.sonarqube.tests.performance;
 
-import org.apache.commons.lang.StringUtils;
-
-import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import org.apache.commons.lang.StringUtils;
 
 public class MavenLogs {
 
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/MavenLogsTest.java b/tests/src/test/java/org/sonarqube/tests/performance/MavenLogsTest.java
index fead3f5a49e..b9df51bbebc 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/MavenLogsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/MavenLogsTest.java
@@ -17,12 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf.scanner;
+package org.sonarqube.tests.performance;
 
 import org.junit.Test;
-import org.sonarsource.sonarqube.perf.MavenLogs;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class MavenLogsTest {
   @Test
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/PerfRule.java b/tests/src/test/java/org/sonarqube/tests/performance/PerfRule.java
index 38d7343a6dd..7b12d79bd38 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/PerfRule.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/PerfRule.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf;
+package org.sonarqube.tests.performance;
 
 import com.google.common.base.Joiner;
 import org.hamcrest.CustomMatcher;
@@ -68,10 +68,10 @@ public abstract class PerfRule extends ErrorCollector {
       checkThat(String.format("Expected %d ms in average, got %d ms [%s]", expectedDuration, meanDuration, Joiner.on(",").join(getAllResultsOfCurrentStep())), Math.abs(variation),
         new CustomMatcher<Double>(
           "a value less than "
-            + PerfTestCase.ACCEPTED_DURATION_VARIATION_IN_PERCENTS) {
+            + AbstractPerfTest.ACCEPTED_DURATION_VARIATION_IN_PERCENTS) {
           @Override
           public boolean matches(Object item) {
-            return ((item instanceof Double) && ((Double) item).compareTo(PerfTestCase.ACCEPTED_DURATION_VARIATION_IN_PERCENTS) < 0);
+            return ((item instanceof Double) && ((Double) item).compareTo(AbstractPerfTest.ACCEPTED_DURATION_VARIATION_IN_PERCENTS) < 0);
           }
         });
     }
diff --git a/tests/perf/src/main/java/org/sonarsource/sonarqube/perf/ServerLogs.java b/tests/src/test/java/org/sonarqube/tests/performance/ServerLogs.java
index 27ee3740c3c..ece4f4a26a7 100644
--- a/tests/perf/src/main/java/org/sonarsource/sonarqube/perf/ServerLogs.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/ServerLogs.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf;
+package org.sonarqube.tests.performance;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.container.Server;
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/ServerLogsTest.java b/tests/src/test/java/org/sonarqube/tests/performance/ServerLogsTest.java
index 362b7c43da1..7ace69e4a52 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/ServerLogsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/ServerLogsTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf;
+package org.sonarqube.tests.performance;
 
 import com.google.common.collect.Lists;
 import org.junit.Test;
 
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class ServerLogsTest {
   @Test
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/BootstrappingTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/BootstrappingTest.java
index 578a4ebbcf7..a8e3c2376a8 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/BootstrappingTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/BootstrappingTest.java
@@ -17,14 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf.scanner.suite;
+package org.sonarqube.tests.performance.scanner;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import org.sonarsource.sonarqube.perf.MavenLogs;
-import org.sonarsource.sonarqube.perf.PerfRule;
-import org.sonarsource.sonarqube.perf.PerfTestCase;
 import java.io.File;
 import java.io.IOException;
 import org.apache.commons.io.FileUtils;
@@ -34,9 +31,12 @@ import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.sonarqube.tests.performance.AbstractPerfTest;
+import org.sonarqube.tests.performance.MavenLogs;
+import org.sonarqube.tests.performance.PerfRule;
 
 @Ignore("Timeout on computation side")
-public class BootstrappingTest extends PerfTestCase {
+public class BootstrappingTest extends AbstractPerfTest {
 
   @Rule
   public PerfRule perfRule = new PerfRule(4) {
@@ -50,13 +50,13 @@ public class BootstrappingTest extends PerfTestCase {
   public static TemporaryFolder temp = new TemporaryFolder();
 
   @ClassRule
-  public static Orchestrator orchestrator = ScannerPerfTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = ScannerPerformanceSuite.ORCHESTRATOR;
 
   private static File manyFlatModulesBaseDir;
   private static File manyNestedModulesBaseDir;
 
   @BeforeClass
-  public static void setUp() throws IOException {
+  public static void setUp() throws Exception {
     // Execute a first analysis to prevent any side effects with cache of plugin JAR files
     orchestrator.executeBuild(newScanner("-Xmx512m -server", "sonar.profile", "one-xoo-issue-per-line"));
 
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/DuplicationTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/DuplicationTest.java
index b3af4d463b2..4729fb331d8 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/DuplicationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/DuplicationTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf.scanner.suite;
+package org.sonarqube.tests.performance.scanner;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
-import com.sonar.orchestrator.locator.FileLocation;
+import java.io.File;
 import java.io.IOException;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -32,18 +32,18 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ErrorCollector;
 import org.junit.rules.TemporaryFolder;
+import org.sonarqube.tests.performance.AbstractPerfTest;
 import org.sonarqube.ws.WsMeasures;
 import org.sonarqube.ws.client.HttpConnector;
 import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.WsClientFactories;
 import org.sonarqube.ws.client.measure.ComponentWsRequest;
-import org.sonarsource.sonarqube.perf.PerfTestCase;
 
 import static java.lang.Double.parseDouble;
 import static java.util.Arrays.asList;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
-public class DuplicationTest extends PerfTestCase {
+public class DuplicationTest extends AbstractPerfTest {
 
   @Rule
   public ErrorCollector collector = new ErrorCollector();
@@ -52,7 +52,7 @@ public class DuplicationTest extends PerfTestCase {
   public TemporaryFolder temp = new TemporaryFolder();
 
   @ClassRule
-  public static Orchestrator orchestrator = ScannerPerfTestSuite.ORCHESTRATOR;
+  public static final Orchestrator orchestrator = ScannerPerformanceSuite.ORCHESTRATOR;
 
   @BeforeClass
   public static void setUp() throws IOException {
@@ -70,7 +70,7 @@ public class DuplicationTest extends PerfTestCase {
    */
   @Test
   public void hugeJavaFile() {
-    MavenBuild build = MavenBuild.create(FileLocation.of("projects/huge-file/pom.xml").getFile())
+    MavenBuild build = MavenBuild.create(new File("projects/performance/huge-file/pom.xml"))
       .setEnvironmentVariable("MAVEN_OPTS", "-Xmx1024m")
       .setProperty("sonar.sourceEncoding", "UTF-8")
       .setCleanSonarGoals();
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/FileSystemTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/FileSystemTest.java
index 99b6e16c369..fca5799f3ea 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/FileSystemTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/FileSystemTest.java
@@ -17,12 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf.scanner.suite;
+package org.sonarqube.tests.performance.scanner;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
-import org.sonarsource.sonarqube.perf.PerfRule;
-import org.sonarsource.sonarqube.perf.PerfTestCase;
 import java.io.File;
 import java.io.IOException;
 import java.util.Properties;
@@ -34,8 +32,10 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+import org.sonarqube.tests.performance.AbstractPerfTest;
+import org.sonarqube.tests.performance.PerfRule;
 
-public class FileSystemTest extends PerfTestCase {
+public class FileSystemTest extends AbstractPerfTest {
 
   @Rule
   public PerfRule perfRule = new PerfRule(4) {
@@ -49,7 +49,7 @@ public class FileSystemTest extends PerfTestCase {
   public static TemporaryFolder temp = new TemporaryFolder();
 
   @ClassRule
-  public static Orchestrator orchestrator = ScannerPerfTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = ScannerPerformanceSuite.ORCHESTRATOR;
 
   private static File baseDir;
 
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/HighlightingTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/HighlightingTest.java
index b09c3278bfe..f995244763b 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/HighlightingTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/HighlightingTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf.scanner.suite;
+package org.sonarqube.tests.performance.scanner;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
@@ -33,11 +33,11 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.sonarsource.sonarqube.perf.MavenLogs;
-import org.sonarsource.sonarqube.perf.PerfRule;
-import org.sonarsource.sonarqube.perf.PerfTestCase;
+import org.sonarqube.tests.performance.AbstractPerfTest;
+import org.sonarqube.tests.performance.MavenLogs;
+import org.sonarqube.tests.performance.PerfRule;
 
-public class HighlightingTest extends PerfTestCase {
+public class HighlightingTest extends AbstractPerfTest {
 
   @Rule
   public PerfRule perfRule = new PerfRule(4) {
@@ -51,7 +51,7 @@ public class HighlightingTest extends PerfTestCase {
   public static TemporaryFolder temp = new TemporaryFolder();
 
   @ClassRule
-  public static Orchestrator orchestrator = ScannerPerfTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = ScannerPerformanceSuite.ORCHESTRATOR;
 
   @BeforeClass
   public static void setUp() throws IOException {
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/IssuesModeTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/IssuesModeTest.java
index b5846ab9f3d..03f811529e1 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/IssuesModeTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/IssuesModeTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf.scanner.suite;
+package org.sonarqube.tests.performance.scanner;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
@@ -28,13 +28,13 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.sonarsource.sonarqube.perf.PerfRule;
-import org.sonarsource.sonarqube.perf.PerfTestCase;
+import org.sonarqube.tests.performance.AbstractPerfTest;
+import org.sonarqube.tests.performance.PerfRule;
 
-public class IssuesModeTest extends PerfTestCase {
+public class IssuesModeTest extends AbstractPerfTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = ScannerPerfTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = ScannerPerformanceSuite.ORCHESTRATOR;
 
   @ClassRule
   public static TemporaryFolder temp = new TemporaryFolder();
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/MemoryTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/MemoryTest.java
index d05852c9078..2b9b162d72e 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/MemoryTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/MemoryTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf.scanner.suite;
+package org.sonarqube.tests.performance.scanner;
 
 import com.google.common.base.Strings;
 import com.sonar.orchestrator.Orchestrator;
@@ -32,11 +32,11 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.sonarsource.sonarqube.perf.MavenLogs;
-import org.sonarsource.sonarqube.perf.PerfRule;
-import org.sonarsource.sonarqube.perf.PerfTestCase;
+import org.sonarqube.tests.performance.AbstractPerfTest;
+import org.sonarqube.tests.performance.MavenLogs;
+import org.sonarqube.tests.performance.PerfRule;
 
-public class MemoryTest extends PerfTestCase {
+public class MemoryTest extends AbstractPerfTest {
 
   @Rule
   public PerfRule perfRule = new PerfRule(4) {
@@ -50,21 +50,21 @@ public class MemoryTest extends PerfTestCase {
   public static TemporaryFolder temp = new TemporaryFolder();
 
   @ClassRule
-  public static Orchestrator orchestrator = ScannerPerfTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = ScannerPerformanceSuite.ORCHESTRATOR;
 
   @Before
   public void cleanDatabase() {
     orchestrator.resetData();
   }
 
+  int DEPTH = 4;
+
   @Test
   public void should_not_fail_with_limited_xmx_memory_and_no_coverage_per_test() {
     orchestrator.executeBuild(
       newScanner("-Xmx80m -server -XX:-HeapDumpOnOutOfMemoryError"));
   }
 
-  int DEPTH = 4;
-
   // Property on root module is duplicated in each module so it may be big
   @Test
   public void analyzeProjectWithManyModulesAndBigProperties() throws IOException {
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/ScannerPerfTestSuite.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/ScannerPerformanceSuite.java
index e550fd97363..bfb8fb2e3b4 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/ScannerPerfTestSuite.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/ScannerPerformanceSuite.java
@@ -17,17 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf.scanner.suite;
+package org.sonarqube.tests.performance.scanner;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.locator.FileLocation;
-import org.sonarsource.sonarqube.perf.PerfTestCase;
 import java.io.File;
 import java.io.IOException;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
+import org.sonarqube.tests.performance.AbstractPerfTest;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
@@ -35,15 +35,15 @@ import org.junit.runners.Suite;
   DuplicationTest.class,
   FileSystemTest.class,
   HighlightingTest.class,
-  MemoryTest.class,
-  IssuesModeTest.class
+  IssuesModeTest.class,
+  MemoryTest.class
 })
-public class ScannerPerfTestSuite {
+public class ScannerPerformanceSuite {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator
     .builderEnv()
-    .addPlugin(FileLocation.byWildcardMavenFilename(new File("../../plugins/sonar-xoo-plugin/target"), "sonar-xoo-plugin-*.jar"))
+    .addPlugin(FileLocation.byWildcardMavenFilename(new File("../plugins/sonar-xoo-plugin/target"), "sonar-xoo-plugin-*.jar"))
     // should not be so high, but required as long embedded h2 is used -> requires more memory on server
     .setServerProperty("sonar.web.javaOpts", "-Xmx1G -XX:+HeapDumpOnOutOfMemoryError")
     // Needed by DuplicationTest::hugeJavaFile
@@ -54,6 +54,6 @@ public class ScannerPerfTestSuite {
   @BeforeClass
   public static void setUp() throws IOException {
     // Execute a first analysis to prevent any side effects with cache of plugin JAR files
-    ORCHESTRATOR.executeBuild(PerfTestCase.newScanner("-Xmx512m -server", "sonar.profile", "one-xoo-issue-per-line"));
+    ORCHESTRATOR.executeBuild(AbstractPerfTest.newScanner("-Xmx512m -server", "sonar.profile", "one-xoo-issue-per-line"));
   }
 }
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java b/tests/src/test/java/org/sonarqube/tests/performance/server/ComputeEnginePerfTest.java
index a3d70fc531c..e6376641a37 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/server/ComputeEnginePerfTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf.computation;
+package org.sonarqube.tests.performance.server;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
@@ -31,10 +31,10 @@ import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
-import org.sonarsource.sonarqube.perf.PerfTestCase;
-import org.sonarsource.sonarqube.perf.ServerLogs;
+import org.sonarqube.tests.performance.AbstractPerfTest;
+import org.sonarqube.tests.performance.ServerLogs;
 
-public class ComputationTest extends PerfTestCase {
+public class ComputeEnginePerfTest extends AbstractPerfTest {
   private static int MAX_HEAP_SIZE_IN_MEGA = 600;
 
   @ClassRule
@@ -43,7 +43,7 @@ public class ComputationTest extends PerfTestCase {
   @ClassRule
   public static Orchestrator orchestrator = Orchestrator
     .builderEnv()
-    .addPlugin(FileLocation.byWildcardMavenFilename(new File("../../plugins/sonar-xoo-plugin/target"), "sonar-xoo-plugin-*.jar"))
+    .addPlugin(FileLocation.byWildcardMavenFilename(new File("../plugins/sonar-xoo-plugin/target"), "sonar-xoo-plugin-*.jar"))
     .setServerProperty(
       "sonar.web.javaOpts",
       String.format("-Xms%dm -Xmx%dm -XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true", MAX_HEAP_SIZE_IN_MEGA, MAX_HEAP_SIZE_IN_MEGA))
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java b/tests/src/test/java/org/sonarqube/tests/performance/server/ServerPerfTest.java
index 4633b44c043..7aa915ce982 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/server/ServerPerfTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.perf.server;
+package org.sonarqube.tests.performance.server;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.locator.FileLocation;
@@ -29,12 +29,12 @@ import java.util.List;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
-import org.sonarsource.sonarqube.perf.PerfTestCase;
-import org.sonarsource.sonarqube.perf.ServerLogs;
+import org.sonarqube.tests.performance.AbstractPerfTest;
+import org.sonarqube.tests.performance.ServerLogs;
 
 import static org.apache.commons.io.FileUtils.readLines;
 
-public class ServerTest extends PerfTestCase {
+public class ServerPerfTest extends AbstractPerfTest {
   private static final int TIMEOUT_3_MINUTES = 1000 * 60 * 3;
 
   @Rule
@@ -45,7 +45,7 @@ public class ServerTest extends PerfTestCase {
   public void server_startup_and_shutdown() throws Exception {
     String defaultWebJavaOptions = "-Xmx768m -XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -Dfile.encoding=UTF-8";
     Orchestrator orchestrator = Orchestrator.builderEnv()
-      .addPlugin(FileLocation.byWildcardMavenFilename(new File("../../plugins/sonar-xoo-plugin/target"), "sonar-xoo-plugin-*.jar"))
+      .addPlugin(FileLocation.byWildcardMavenFilename(new File("../plugins/sonar-xoo-plugin/target"), "sonar-xoo-plugin-*.jar"))
 
       // See http://wiki.apache.org/tomcat/HowTo/FasterStartUp
       // Sometimes source of entropy is too small and Tomcat spends ~20 seconds on the step :
diff --git a/tests/src/test/java/org/sonarqube/tests/performance/server/ServerPerformanceSuite.java b/tests/src/test/java/org/sonarqube/tests/performance/server/ServerPerformanceSuite.java
new file mode 100644
index 00000000000..c4c6c66787e
--- /dev/null
+++ b/tests/src/test/java/org/sonarqube/tests/performance/server/ServerPerformanceSuite.java
@@ -0,0 +1,31 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonarqube.tests.performance.server;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+  ComputeEnginePerfTest.class,
+  ServerPerfTest.class
+})
+public class ServerPerformanceSuite {
+}
diff --git a/it/it-tests/src/test/java/it/PluginsSuite.java b/tests/src/test/java/org/sonarqube/tests/plugins/PluginsSuite.java
index 843794c8f32..de977606df9 100644
--- a/it/it-tests/src/test/java/it/PluginsSuite.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/PluginsSuite.java
@@ -17,9 +17,8 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it;
+package org.sonarqube.tests.plugins;
 
-import it.plugins.PluginsTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/it/it-tests/src/test/java/it/plugins/PluginsTest.java b/tests/src/test/java/org/sonarqube/tests/plugins/PluginsTest.java
index 7757d130d26..45b9262ca3e 100644
--- a/it/it-tests/src/test/java/it/plugins/PluginsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/PluginsTest.java
@@ -17,30 +17,30 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins;
+package org.sonarqube.tests.plugins;
 
 import com.google.common.collect.Sets;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.OrchestratorBuilder;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.plugins.checks.AbapCheck;
-import it.plugins.checks.CCheck;
-import it.plugins.checks.Check;
-import it.plugins.checks.CobolCheck;
-import it.plugins.checks.CppCheck;
-import it.plugins.checks.FlexCheck;
-import it.plugins.checks.GroovyCheck;
-import it.plugins.checks.JavaCheck;
-import it.plugins.checks.JavascriptCheck;
-import it.plugins.checks.PhpCheck;
-import it.plugins.checks.PliCheck;
-import it.plugins.checks.PythonCheck;
-import it.plugins.checks.RpgCheck;
-import it.plugins.checks.SwiftCheck;
-import it.plugins.checks.Validation;
-import it.plugins.checks.VbCheck;
-import it.plugins.checks.WebCheck;
+import org.sonarqube.tests.plugins.checks.AbapCheck;
+import org.sonarqube.tests.plugins.checks.CCheck;
+import org.sonarqube.tests.plugins.checks.Check;
+import org.sonarqube.tests.plugins.checks.CobolCheck;
+import org.sonarqube.tests.plugins.checks.CppCheck;
+import org.sonarqube.tests.plugins.checks.FlexCheck;
+import org.sonarqube.tests.plugins.checks.GroovyCheck;
+import org.sonarqube.tests.plugins.checks.JavaCheck;
+import org.sonarqube.tests.plugins.checks.JavascriptCheck;
+import org.sonarqube.tests.plugins.checks.PhpCheck;
+import org.sonarqube.tests.plugins.checks.PliCheck;
+import org.sonarqube.tests.plugins.checks.PythonCheck;
+import org.sonarqube.tests.plugins.checks.RpgCheck;
+import org.sonarqube.tests.plugins.checks.SwiftCheck;
+import org.sonarqube.tests.plugins.checks.Validation;
+import org.sonarqube.tests.plugins.checks.VbCheck;
+import org.sonarqube.tests.plugins.checks.WebCheck;
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
@@ -86,7 +86,7 @@ public class PluginsTest {
   @BeforeClass
   public static void startServer() {
     OrchestratorBuilder builder = Orchestrator.builderEnv()
-      .setZipFile(byWildcardMavenFilename(new File("../../sonar-application/target"), "sonar*.zip").getFile());
+      .setZipFile(byWildcardMavenFilename(new File("../sonar-application/target"), "sonar*.zip").getFile());
 
     // FIXME JSON plugin is temporarily disabled as for the moment the github repo doesn't exist anymore installPlugin(builder, "JSON");;
     installPlugin(builder, "Sonargraph");
diff --git a/it/it-tests/src/test/java/it/plugins/Project.java b/tests/src/test/java/org/sonarqube/tests/plugins/Project.java
index c1c950f3fc0..e6bfdffb015 100644
--- a/it/it-tests/src/test/java/it/plugins/Project.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/Project.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins;
+package org.sonarqube.tests.plugins;
 
 import com.google.common.base.Function;
 import java.io.File;
diff --git a/it/it-tests/src/test/java/it/plugins/VersionPluginTest.java b/tests/src/test/java/org/sonarqube/tests/plugins/VersionPluginTest.java
index aecf8658c7b..38b91d3f7ac 100644
--- a/it/it-tests/src/test/java/it/plugins/VersionPluginTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/VersionPluginTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins;
+package org.sonarqube.tests.plugins;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import java.io.IOException;
 import org.junit.Before;
 import org.junit.BeforeClass;
diff --git a/it/it-tests/src/test/java/it/plugins/checks/AbapCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/AbapCheck.java
index b734cc84bd5..a2fc7080198 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/AbapCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/AbapCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class AbapCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/CCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/CCheck.java
index 7cab14f8067..0465a417995 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/CCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/CCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class CCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/Check.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/Check.java
index 8427692fbd8..e85542a6ea7 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/Check.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/Check.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public interface Check {
   void validate(Validation validation);
diff --git a/it/it-tests/src/test/java/it/plugins/checks/CobolCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/CobolCheck.java
index bcd77d8ecad..dc23032edde 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/CobolCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/CobolCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class CobolCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/CppCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/CppCheck.java
index 5628c900907..9cb5359317f 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/CppCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/CppCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class CppCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/CssCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/CssCheck.java
index 5902e593042..b2d10039ae2 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/CssCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/CssCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class CssCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/FlexCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/FlexCheck.java
index aed16f64262..c2443b49363 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/FlexCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/FlexCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class FlexCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/GroovyCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/GroovyCheck.java
index 3b26ae89537..f8bd3b0d9d5 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/GroovyCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/GroovyCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class GroovyCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/JavaCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/JavaCheck.java
index 7c9cb90ec8c..f5c7f3f86fe 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/JavaCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/JavaCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class JavaCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/JavascriptCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/JavascriptCheck.java
index 0ed806a4b16..40f74d64943 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/JavascriptCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/JavascriptCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class JavascriptCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/PhpCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/PhpCheck.java
index c9593b1b70f..f1b5e36aa36 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/PhpCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/PhpCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class PhpCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/PliCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/PliCheck.java
index 464faadbafb..3d08a1baaec 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/PliCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/PliCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class PliCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/PythonCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/PythonCheck.java
index 7b316faac25..d7f901ac817 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/PythonCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/PythonCheck.java
@@ -17,9 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
-import it.plugins.Project;
+import org.sonarqube.tests.plugins.Project;
 
 public class PythonCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/RpgCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/RpgCheck.java
index 790d3858d1b..eb0010e801f 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/RpgCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/RpgCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class RpgCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/SwiftCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/SwiftCheck.java
index 8a4329c5962..8360ff253d1 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/SwiftCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/SwiftCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class SwiftCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/Validation.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/Validation.java
index de214a9e65e..9b2f9a4ea21 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/Validation.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/Validation.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 import com.google.common.base.Joiner;
 import com.google.gson.Gson;
 import com.sonar.orchestrator.Orchestrator;
-import it.plugins.Project;
+import org.sonarqube.tests.plugins.Project;
 import java.io.File;
 import java.util.List;
 import java.util.Map;
diff --git a/it/it-tests/src/test/java/it/plugins/checks/VbCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/VbCheck.java
index 6cd1ca7669b..4438277fd49 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/VbCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/VbCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class VbCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/plugins/checks/WebCheck.java b/tests/src/test/java/org/sonarqube/tests/plugins/checks/WebCheck.java
index b0cf9550a43..8c999254cdd 100644
--- a/it/it-tests/src/test/java/it/plugins/checks/WebCheck.java
+++ b/tests/src/test/java/org/sonarqube/tests/plugins/checks/WebCheck.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.plugins.checks;
+package org.sonarqube.tests.plugins.checks;
 
 public class WebCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/it/previewAnalysis/ToDoTest.java b/tests/src/test/java/org/sonarqube/tests/previewAnalysis/ToDoTest.java
index ce3d94d6d55..67122882ba2 100644
--- a/it/it-tests/src/test/java/it/previewAnalysis/ToDoTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/previewAnalysis/ToDoTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.previewAnalysis;
+package org.sonarqube.tests.previewAnalysis;
 
 public class ToDoTest {
 }
diff --git a/it/it-tests/src/test/java/it/projectAdministration/BackgroundTasksTest.java b/tests/src/test/java/org/sonarqube/tests/projectAdministration/BackgroundTasksTest.java
index 33651550e75..0c4e916ebf7 100644
--- a/it/it-tests/src/test/java/it/projectAdministration/BackgroundTasksTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectAdministration/BackgroundTasksTest.java
@@ -17,20 +17,20 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectAdministration;
+package org.sonarqube.tests.projectAdministration;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import pageobjects.BackgroundTaskItem;
-import pageobjects.BackgroundTasksPage;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.BackgroundTaskItem;
+import org.sonarqube.pageobjects.BackgroundTasksPage;
+import org.sonarqube.pageobjects.Navigation;
 import util.user.UserRule;
 
 import static com.codeborne.selenide.CollectionCondition.sizeGreaterThan;
diff --git a/it/it-tests/src/test/java/it/projectAdministration/BulkDeletionTest.java b/tests/src/test/java/org/sonarqube/tests/projectAdministration/BulkDeletionTest.java
index 602eeaab829..e31020a3700 100644
--- a/it/it-tests/src/test/java/it/projectAdministration/BulkDeletionTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectAdministration/BulkDeletionTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectAdministration;
+package org.sonarqube.tests.projectAdministration;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/projectAdministration/ProjectAdministrationTest.java b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectAdministrationTest.java
index 716463c2fde..7d46eb61e7c 100644
--- a/it/it-tests/src/test/java/it/projectAdministration/ProjectAdministrationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectAdministrationTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectAdministration;
+package org.sonarqube.tests.projectAdministration;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.io.UnsupportedEncodingException;
 import java.sql.SQLException;
 import java.util.Calendar;
@@ -38,8 +38,8 @@ import org.junit.rules.ExpectedException;
 import org.sonar.wsclient.SonarClient;
 import org.sonar.wsclient.base.HttpException;
 import org.sonar.wsclient.user.UserParameters;
-import pageobjects.Navigation;
-import pageobjects.settings.SettingsPage;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.settings.SettingsPage;
 import util.user.UserRule;
 
 import static org.apache.commons.lang.time.DateUtils.addDays;
diff --git a/it/it-tests/src/test/java/it/projectAdministration/ProjectKeyPageTest.java b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectKeyPageTest.java
index ec55c8fe7ae..a1d7f61aba1 100644
--- a/it/it-tests/src/test/java/it/projectAdministration/ProjectKeyPageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectKeyPageTest.java
@@ -17,19 +17,19 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectAdministration;
+package org.sonarqube.tests.projectAdministration;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.WsClient;
-import pageobjects.Navigation;
-import pageobjects.ProjectKeyPage;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.ProjectKeyPage;
 
 import static com.codeborne.selenide.Condition.visible;
 import static com.codeborne.selenide.Selenide.$;
diff --git a/it/it-tests/src/test/java/it/projectAdministration/ProjectLinksPageTest.java b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectLinksPageTest.java
index e9a96bd5a9a..5cb04c3b4e8 100644
--- a/it/it-tests/src/test/java/it/projectAdministration/ProjectLinksPageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectLinksPageTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectAdministration;
+package org.sonarqube.tests.projectAdministration;
 
 import com.codeborne.selenide.Condition;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.util.List;
 import org.junit.After;
 import org.junit.Before;
@@ -34,9 +34,9 @@ import org.sonarqube.ws.WsProjectLinks.CreateWsResponse;
 import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.projectlinks.CreateWsRequest;
 import org.sonarqube.ws.client.projectlinks.DeleteWsRequest;
-import pageobjects.Navigation;
-import pageobjects.ProjectLinkItem;
-import pageobjects.ProjectLinksPage;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.ProjectLinkItem;
+import org.sonarqube.pageobjects.ProjectLinksPage;
 import util.user.UserRule;
 
 import static com.codeborne.selenide.Condition.hasText;
diff --git a/it/it-tests/src/test/java/it/projectAdministration/ProjectPermissionsTest.java b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectPermissionsTest.java
index e1b3c33cb52..2184a9a9506 100644
--- a/it/it-tests/src/test/java/it/projectAdministration/ProjectPermissionsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectPermissionsTest.java
@@ -17,18 +17,18 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectAdministration;
+package org.sonarqube.tests.projectAdministration;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import pageobjects.Navigation;
-import pageobjects.ProjectPermissionsPage;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.ProjectPermissionsPage;
 import util.user.UserRule;
 
 import static util.ItUtils.projectDir;
diff --git a/it/it-tests/src/test/java/it/projectAdministration/ProjectQualityGatePageTest.java b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectQualityGatePageTest.java
index 2484cd298b6..9fd03897d08 100644
--- a/it/it-tests/src/test/java/it/projectAdministration/ProjectQualityGatePageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectQualityGatePageTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectAdministration;
+package org.sonarqube.tests.projectAdministration;
 
 import com.codeborne.selenide.Condition;
 import com.codeborne.selenide.SelenideElement;
 import com.sonar.orchestrator.Orchestrator;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -33,8 +33,8 @@ import org.sonar.wsclient.qualitygate.QualityGateClient;
 import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.qualitygate.SelectWsRequest;
-import pageobjects.Navigation;
-import pageobjects.ProjectQualityGatePage;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.ProjectQualityGatePage;
 
 import static util.ItUtils.newAdminWsClient;
 
diff --git a/it/it-tests/src/test/java/it/administration/ProjectsAdministrationTest.java b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectVisibilityTest.java
index 75f6e0163d4..45146bbe410 100644
--- a/it/it-tests/src/test/java/it/administration/ProjectsAdministrationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectVisibilityTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.administration;
+package org.sonarqube.tests.projectAdministration;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.sql.SQLException;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -31,16 +31,15 @@ import org.sonarqube.ws.WsComponents;
 import org.sonarqube.ws.client.component.SearchProjectsRequest;
 import org.sonarqube.ws.client.permission.RemoveGroupWsRequest;
 import org.sonarqube.ws.client.project.UpdateVisibilityRequest;
-import pageobjects.Navigation;
-import pageobjects.ProjectsManagementPage;
-import util.ItUtils;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.ProjectsManagementPage;
 import util.user.UserRule;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.newAdminWsClient;
 import static util.ItUtils.projectDir;
 
-public class ProjectsAdministrationTest {
+public class ProjectVisibilityTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
@@ -62,7 +61,7 @@ public class ProjectsAdministrationTest {
   public void return_all_projects_even_when_no_permission() throws Exception {
     orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample")).setProperties("sonar.projectKey", "sample1"));
     orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample")).setProperties("sonar.projectKey", "sample2"));
-    ItUtils.newAdminWsClient(orchestrator).projects().updateVisibility(UpdateVisibilityRequest.builder().setProject("sample2").setVisibility("private").build());
+    newAdminWsClient(orchestrator).projects().updateVisibility(UpdateVisibilityRequest.builder().setProject("sample2").setVisibility("private").build());
     // Remove 'Admin' permission for admin group on project 2 -> No one can access or admin this project, expect System Admin
     newAdminWsClient(orchestrator).permissions().removeGroup(new RemoveGroupWsRequest().setProjectKey("sample2").setGroupName("sonar-administrators").setPermission("admin"));
 
diff --git a/it/it-tests/src/test/java/it/projectEvent/EventTest.java b/tests/src/test/java/org/sonarqube/tests/projectEvent/EventTest.java
index ec7b9df723d..4941929515c 100644
--- a/it/it-tests/src/test/java/it/projectEvent/EventTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectEvent/EventTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectEvent;
+package org.sonarqube.tests.projectEvent;
 
 import com.google.common.collect.Lists;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.util.List;
 import org.junit.Before;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/projectEvent/ProjectActivityPageTest.java b/tests/src/test/java/org/sonarqube/tests/projectEvent/ProjectActivityPageTest.java
index 8128fb2dc7d..5a10c83e607 100644
--- a/it/it-tests/src/test/java/it/projectEvent/ProjectActivityPageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectEvent/ProjectActivityPageTest.java
@@ -17,19 +17,19 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectEvent;
+package org.sonarqube.tests.projectEvent;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.util.List;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import pageobjects.Navigation;
-import pageobjects.ProjectActivityPage;
-import pageobjects.ProjectAnalysisItem;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.ProjectActivityPage;
+import org.sonarqube.pageobjects.ProjectAnalysisItem;
 import util.user.UserRule;
 
 import static util.ItUtils.projectDir;
diff --git a/it/it-tests/src/test/java/it/projectSearch/LeakProjectsPageTest.java b/tests/src/test/java/org/sonarqube/tests/projectSearch/LeakProjectsPageTest.java
index 0e799250639..78c56f8bea2 100644
--- a/it/it-tests/src/test/java/it/projectSearch/LeakProjectsPageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectSearch/LeakProjectsPageTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectSearch;
+package org.sonarqube.tests.projectSearch;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;
@@ -31,9 +31,9 @@ import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Organizations.Organization;
-import pageobjects.projects.ProjectsPage;
+import org.sonarqube.pageobjects.projects.ProjectsPage;
 
 import static com.codeborne.selenide.WebDriverRunner.url;
 import static java.util.Arrays.asList;
diff --git a/it/it-tests/src/test/java/it/projectSearch/ProjectsPageTest.java b/tests/src/test/java/org/sonarqube/tests/projectSearch/ProjectsPageTest.java
index 6ce32eccae5..dde5ace24cb 100644
--- a/it/it-tests/src/test/java/it/projectSearch/ProjectsPageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectSearch/ProjectsPageTest.java
@@ -17,24 +17,24 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectSearch;
+package org.sonarqube.tests.projectSearch;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.WsUsers;
 import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.project.DeleteRequest;
-import pageobjects.Navigation;
-import pageobjects.projects.ProjectsPage;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.projects.ProjectsPage;
 
 import static com.codeborne.selenide.Selenide.clearBrowserLocalStorage;
 import static com.codeborne.selenide.WebDriverRunner.url;
diff --git a/it/it-tests/src/test/java/it/projectSearch/SearchProjectsTest.java b/tests/src/test/java/org/sonarqube/tests/projectSearch/SearchProjectsTest.java
index 534e0688156..8383935cab8 100644
--- a/it/it-tests/src/test/java/it/projectSearch/SearchProjectsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/projectSearch/SearchProjectsTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.projectSearch;
+package org.sonarqube.tests.projectSearch;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -30,7 +30,7 @@ import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Common;
 import org.sonarqube.ws.Organizations.Organization;
 import org.sonarqube.ws.WsComponents.Component;
diff --git a/it/it-tests/src/test/java/it/qualityGate/QualityGateNotificationTest.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateNotificationTest.java
index 64f8dffa974..69e24dddbda 100644
--- a/it/it-tests/src/test/java/it/qualityGate/QualityGateNotificationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateNotificationTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityGate;
+package org.sonarqube.tests.qualityGate;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.util.Iterator;
 import javax.mail.internet.MimeMessage;
 import org.junit.AfterClass;
diff --git a/it/it-tests/src/test/java/it/qualityGate/QualityGateOnRatingMeasuresTest.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateOnRatingMeasuresTest.java
index 39946f4d24b..db5b8e92bdc 100644
--- a/it/it-tests/src/test/java/it/qualityGate/QualityGateOnRatingMeasuresTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateOnRatingMeasuresTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityGate;
+package org.sonarqube.tests.qualityGate;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
diff --git a/it/it-tests/src/test/java/it/qualityGate/QualityGateTest.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateTest.java
index e5675df4a4f..fc6a8adc0a0 100644
--- a/it/it-tests/src/test/java/it/qualityGate/QualityGateTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateTest.java
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityGate;
+package org.sonarqube.tests.qualityGate;
 
 import com.google.gson.Gson;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
diff --git a/it/it-tests/src/test/java/it/qualityGate/QualityGateUiTest.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateUiTest.java
index 9d09e69aebf..4404dc7ca80 100644
--- a/it/it-tests/src/test/java/it/qualityGate/QualityGateUiTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateUiTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityGate;
+package org.sonarqube.tests.qualityGate;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.util.Date;
 import javax.annotation.Nullable;
 import org.apache.commons.lang.time.DateFormatUtils;
@@ -35,8 +35,8 @@ import org.sonar.wsclient.qualitygate.QualityGate;
 import org.sonar.wsclient.qualitygate.QualityGateClient;
 import org.sonar.wsclient.qualitygate.QualityGateCondition;
 import org.sonar.wsclient.qualitygate.UpdateCondition;
-import pageobjects.Navigation;
-import pageobjects.ProjectActivityPage;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.ProjectActivityPage;
 
 import static org.apache.commons.lang.time.DateUtils.addDays;
 import static util.ItUtils.projectDir;
diff --git a/it/it-tests/src/test/java/it/qualityModel/DebtConfigurationRule.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/DebtConfigurationRule.java
index 7ab6e14f657..ee4648373b7 100644
--- a/it/it-tests/src/test/java/it/qualityModel/DebtConfigurationRule.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/DebtConfigurationRule.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityModel;
+package org.sonarqube.tests.qualityModel;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableSet;
diff --git a/it/it-tests/src/test/java/it/qualityModel/MaintainabilityMeasureTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/MaintainabilityMeasureTest.java
index 53afb199131..13c310481f2 100644
--- a/it/it-tests/src/test/java/it/qualityModel/MaintainabilityMeasureTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/MaintainabilityMeasureTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityModel;
+package org.sonarqube.tests.qualityModel;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
diff --git a/it/it-tests/src/test/java/it/qualityModel/MaintainabilityRatingMeasureTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/MaintainabilityRatingMeasureTest.java
index bac82dfc695..01834898461 100644
--- a/it/it-tests/src/test/java/it/qualityModel/MaintainabilityRatingMeasureTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/MaintainabilityRatingMeasureTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityModel;
+package org.sonarqube.tests.qualityModel;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
diff --git a/it/it-tests/src/test/java/it/qualityModel/NewDebtRatioMeasureTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/NewDebtRatioMeasureTest.java
index 66bcad3470f..90192354c83 100644
--- a/it/it-tests/src/test/java/it/qualityModel/NewDebtRatioMeasureTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/NewDebtRatioMeasureTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityModel;
+package org.sonarqube.tests.qualityModel;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import java.util.Date;
 import javax.annotation.Nullable;
 import org.junit.AfterClass;
diff --git a/it/it-tests/src/test/java/it/qualityModel/ReliabilityMeasureTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/ReliabilityMeasureTest.java
index 05358f4e66f..3afaa189ea9 100644
--- a/it/it-tests/src/test/java/it/qualityModel/ReliabilityMeasureTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/ReliabilityMeasureTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityModel;
+package org.sonarqube.tests.qualityModel;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import java.util.Map;
 import org.junit.Before;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/qualityModel/SecurityMeasureTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/SecurityMeasureTest.java
index 4ea301408d9..5aa1d0b1428 100644
--- a/it/it-tests/src/test/java/it/qualityModel/SecurityMeasureTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/SecurityMeasureTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityModel;
+package org.sonarqube.tests.qualityModel;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import java.util.Map;
 import org.junit.Before;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtInIssueChangelogTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtInIssueChangelogTest.java
index 2389846f764..cb181386895 100644
--- a/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtInIssueChangelogTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtInIssueChangelogTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityModel;
+package org.sonarqube.tests.qualityModel;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import java.util.List;
 import org.junit.Before;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtMeasureVariationTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtMeasureVariationTest.java
index bfc83b21ccf..5ea52641e4c 100644
--- a/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtMeasureVariationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtMeasureVariationTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityModel;
+package org.sonarqube.tests.qualityModel;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtTest.java
index a69e2c72e31..6eb57cc0ea3 100644
--- a/it/it-tests/src/test/java/it/qualityModel/TechnicalDebtTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityModel;
+package org.sonarqube.tests.qualityModel;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import java.util.List;
 import org.junit.Before;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/qualityProfile/BuiltInQualityProfilesTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesTest.java
index fa9a4e8ccd0..82719d800f3 100644
--- a/it/it-tests/src/test/java/it/qualityProfile/BuiltInQualityProfilesTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesTest.java
@@ -17,16 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityProfile;
+package org.sonarqube.tests.qualityProfile;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import java.util.function.Predicate;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Session;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Session;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Organizations.Organization;
 import org.sonarqube.ws.QualityProfiles;
 import org.sonarqube.ws.QualityProfiles.CreateWsResponse;
diff --git a/it/it-tests/src/test/java/it/qualityProfile/CustomQualityProfilesTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/CustomQualityProfilesTest.java
index ab9cd6b6582..0be4b07d90f 100644
--- a/it/it-tests/src/test/java/it/qualityProfile/CustomQualityProfilesTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/CustomQualityProfilesTest.java
@@ -17,20 +17,20 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityProfile;
+package org.sonarqube.tests.qualityProfile;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.QProfileTester;
-import org.sonarqube.test.Session;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.QProfileTester;
+import org.sonarqube.tests.Session;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Organizations.Organization;
 import org.sonarqube.ws.QualityProfiles;
 import org.sonarqube.ws.QualityProfiles.CreateWsResponse.QualityProfile;
diff --git a/it/it-tests/src/test/java/it/qualityProfile/OrganizationQualityProfilesUiTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/OrganizationQualityProfilesUiTest.java
index 11d31a89a65..1d9b9c1e420 100644
--- a/it/it-tests/src/test/java/it/qualityProfile/OrganizationQualityProfilesUiTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/OrganizationQualityProfilesUiTest.java
@@ -17,23 +17,23 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityProfile;
+package org.sonarqube.tests.qualityProfile;
 
 import com.codeborne.selenide.Condition;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Organizations;
 import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.qualityprofile.AddProjectRequest;
 import org.sonarqube.ws.client.qualityprofile.ChangeParentRequest;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.Navigation;
 
 import static com.codeborne.selenide.Selenide.$;
 import static util.ItUtils.projectDir;
diff --git a/it/it-tests/src/test/java/it/qualityProfile/QualityProfilesUiTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesUiTest.java
index 4aa69ae1978..25c126037bb 100644
--- a/it/it-tests/src/test/java/it/qualityProfile/QualityProfilesUiTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesUiTest.java
@@ -17,25 +17,25 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.qualityProfile;
+package org.sonarqube.tests.qualityProfile;
 
 import com.codeborne.selenide.Condition;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.client.PostRequest;
 import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.qualityprofile.AddProjectRequest;
 import org.sonarqube.ws.client.qualityprofile.ChangeParentRequest;
 import org.sonarqube.ws.client.qualityprofile.CreateRequest;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.Navigation;
 import util.user.UserRule;
 
 import static com.codeborne.selenide.Selenide.$;
diff --git a/it/it-tests/src/test/java/it/rule/RuleTagsTest.java b/tests/src/test/java/org/sonarqube/tests/rule/RuleTagsTest.java
index 28267882459..16e9397c713 100644
--- a/it/it-tests/src/test/java/it/rule/RuleTagsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/rule/RuleTagsTest.java
@@ -17,17 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.rule;
+package org.sonarqube.tests.rule;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import java.util.List;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Organizations;
 import org.sonarqube.ws.client.PostRequest;
 import util.ItUtils;
diff --git a/it/it-tests/src/test/java/it/scm/ScmTest.java b/tests/src/test/java/org/sonarqube/tests/scm/ScmTest.java
index 17ec36b8066..16cc5fbe942 100644
--- a/it/it-tests/src/test/java/it/scm/ScmTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/scm/ScmTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.scm;
+package org.sonarqube.tests.scm;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
diff --git a/it/it-tests/src/test/java/it/serverSystem/ClusterTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/ClusterTest.java
index 99b974df50d..ff110377844 100644
--- a/it/it-tests/src/test/java/it/serverSystem/ClusterTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/ClusterTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.serverSystem;
+package org.sonarqube.tests.serverSystem;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableMap;
@@ -121,7 +121,7 @@ public class ClusterTest {
 
       assertThat(FileUtils.readFileToString(web.getServer().getAppLogs())).doesNotContain("Process[es]");
       // call a web service that requires Elasticsearch
-      Issues.SearchWsResponse wsResponse = ItUtils.newWsClient(web).issues().search(new org.sonarqube.ws.client.issue.SearchWsRequest());
+      Issues.SearchWsResponse wsResponse = newWsClient(web).issues().search(new org.sonarqube.ws.client.issue.SearchWsRequest());
       assertThat(wsResponse.getIssuesCount()).isEqualTo(0);
 
       web.restartServer();
diff --git a/it/it-tests/src/test/java/it/serverSystem/HttpHeadersTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/HttpHeadersTest.java
index 12fccdb9ed7..7ac7d9ba0cc 100644
--- a/it/it-tests/src/test/java/it/serverSystem/HttpHeadersTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/HttpHeadersTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.serverSystem;
+package org.sonarqube.tests.serverSystem;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
diff --git a/it/it-tests/src/test/java/it/serverSystem/LogsTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/LogsTest.java
index 7b29b6229db..e9eb13360e9 100644
--- a/it/it-tests/src/test/java/it/serverSystem/LogsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/LogsTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.serverSystem;
+package org.sonarqube.tests.serverSystem;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.io.File;
 import java.io.IOException;
 import java.util.Collection;
diff --git a/it/it-tests/src/test/java/it/serverSystem/PingTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/PingTest.java
index 3be2e6c7132..b1276875ff7 100644
--- a/it/it-tests/src/test/java/it/serverSystem/PingTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/PingTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.serverSystem;
+package org.sonarqube.tests.serverSystem;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.http.HttpResponse;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import org.junit.ClassRule;
 import org.junit.Test;
 
diff --git a/it/it-tests/src/test/java/it/serverSystem/RestartTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/RestartTest.java
index cd58134a2c2..ee69d37febb 100644
--- a/it/it-tests/src/test/java/it/serverSystem/RestartTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/RestartTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.serverSystem;
+package org.sonarqube.tests.serverSystem;
 
 import com.sonar.orchestrator.Orchestrator;
 import org.apache.commons.io.FileUtils;
diff --git a/it/it-tests/src/test/java/it/serverSystem/ServerSystemRestartingOrchestrator.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/ServerSystemRestartingOrchestrator.java
index 03142b3e7cc..02e7887b6cf 100644
--- a/it/it-tests/src/test/java/it/serverSystem/ServerSystemRestartingOrchestrator.java
+++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/ServerSystemRestartingOrchestrator.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.serverSystem;
+package org.sonarqube.tests.serverSystem;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.locator.FileLocation;
diff --git a/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/ServerSystemTest.java
index 6edb93ad309..ad4adf46519 100644
--- a/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/ServerSystemTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.serverSystem;
+package org.sonarqube.tests.serverSystem;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
@@ -39,8 +39,8 @@ import org.sonarqube.ws.ServerId.ShowWsResponse;
 import org.sonarqube.ws.client.GetRequest;
 import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.WsResponse;
-import pageobjects.Navigation;
-import pageobjects.ServerIdPage;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.ServerIdPage;
 import util.ItUtils;
 import util.user.UserRule;
 
diff --git a/it/it-tests/src/test/java/it/settings/DeprecatedPropertiesWsTest.java b/tests/src/test/java/org/sonarqube/tests/settings/DeprecatedPropertiesWsTest.java
index f98eef7565c..4a0bd037333 100644
--- a/it/it-tests/src/test/java/it/settings/DeprecatedPropertiesWsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/settings/DeprecatedPropertiesWsTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.settings;
+package org.sonarqube.tests.settings;
 
 import com.google.common.base.Throwables;
 import com.google.gson.Gson;
 import com.sonar.orchestrator.Orchestrator;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.Arrays;
@@ -49,7 +49,7 @@ import util.user.UserRule;
 
 import static java.net.URLEncoder.encode;
 import static java.util.Arrays.asList;
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.newAdminWsClient;
 import static util.ItUtils.newUserWsClient;
 import static util.ItUtils.newWsClient;
diff --git a/it/it-tests/src/test/java/it/settings/EmailsTest.java b/tests/src/test/java/org/sonarqube/tests/settings/EmailsTest.java
index 9d2924ed133..86967abb6c2 100644
--- a/it/it-tests/src/test/java/it/settings/EmailsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/settings/EmailsTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.settings;
+package org.sonarqube.tests.settings;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.util.Iterator;
 import javax.annotation.Nullable;
 import javax.mail.internet.MimeMessage;
diff --git a/it/it-tests/src/test/java/it/settings/LicensesPageTest.java b/tests/src/test/java/org/sonarqube/tests/settings/LicensesPageTest.java
index 36c51a9c8bc..5f0ebe0078d 100644
--- a/it/it-tests/src/test/java/it/settings/LicensesPageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/settings/LicensesPageTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.settings;
+package org.sonarqube.tests.settings;
 
 import com.sonar.orchestrator.Orchestrator;
 import org.junit.AfterClass;
@@ -28,9 +28,9 @@ import org.junit.Test;
 import org.sonarqube.ws.Settings.ValuesWsResponse;
 import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.setting.ValuesRequest;
-import pageobjects.Navigation;
-import pageobjects.licenses.LicenseItem;
-import pageobjects.licenses.LicensesPage;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.licenses.LicenseItem;
+import org.sonarqube.pageobjects.licenses.LicensesPage;
 import util.user.UserRule;
 
 import static com.codeborne.selenide.Condition.text;
diff --git a/it/it-tests/src/test/java/it/settings/PropertySetsTest.java b/tests/src/test/java/org/sonarqube/tests/settings/PropertySetsTest.java
index d2be7424966..d30b68168e3 100644
--- a/it/it-tests/src/test/java/it/settings/PropertySetsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/settings/PropertySetsTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.settings;
+package org.sonarqube.tests.settings;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 import java.util.Map;
@@ -34,8 +34,8 @@ import org.sonarqube.ws.Settings;
 import org.sonarqube.ws.client.setting.SetRequest;
 import org.sonarqube.ws.client.setting.SettingsService;
 import org.sonarqube.ws.client.setting.ValuesRequest;
-import pageobjects.Navigation;
-import pageobjects.settings.SettingsPage;
+import org.sonarqube.pageobjects.Navigation;
+import org.sonarqube.pageobjects.settings.SettingsPage;
 import util.user.UserRule;
 
 import static com.google.common.collect.Lists.newArrayList;
diff --git a/it/it-tests/src/test/java/it/settings/SettingsTest.java b/tests/src/test/java/org/sonarqube/tests/settings/SettingsTest.java
index 06c948ef824..de7d213db2b 100644
--- a/it/it-tests/src/test/java/it/settings/SettingsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/settings/SettingsTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.settings;
+package org.sonarqube.tests.settings;
 
 import com.google.common.collect.ImmutableMap;
 import com.sonar.orchestrator.Orchestrator;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.io.IOException;
 import java.util.List;
 import javax.annotation.CheckForNull;
diff --git a/it/it-tests/src/test/java/it/settings/SettingsTestRestartingOrchestrator.java b/tests/src/test/java/org/sonarqube/tests/settings/SettingsTestRestartingOrchestrator.java
index aafdf91bac9..60d690257e9 100644
--- a/it/it-tests/src/test/java/it/settings/SettingsTestRestartingOrchestrator.java
+++ b/tests/src/test/java/org/sonarqube/tests/settings/SettingsTestRestartingOrchestrator.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.settings;
+package org.sonarqube.tests.settings;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
@@ -27,8 +27,8 @@ import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import pageobjects.EncryptionPage;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.EncryptionPage;
+import org.sonarqube.pageobjects.Navigation;
 import util.user.UserRule;
 
 import static com.codeborne.selenide.Condition.visible;
diff --git a/it/it-tests/src/test/java/it/sourceCode/EncodingTest.java b/tests/src/test/java/org/sonarqube/tests/sourceCode/EncodingTest.java
index 90fa0c45cf7..985a361fb90 100644
--- a/it/it-tests/src/test/java/it/sourceCode/EncodingTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/sourceCode/EncodingTest.java
@@ -17,31 +17,29 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.sourceCode;
+package org.sonarqube.tests.sourceCode;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category1Suite;
-import org.junit.Before;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
+import org.sonarqube.tests.Tester;
 
 import static util.ItUtils.runProjectAnalysis;
-import static util.selenium.Selenese.runSelenese;
 
 public class EncodingTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
-  @Before
-  public void deleteData() {
-    orchestrator.resetData();
-  }
+  @Rule
+  public Tester tester = new Tester(orchestrator).disableOrganizations();
 
   @Test
   public void support_japanese_charset() {
     runProjectAnalysis(orchestrator, "sourceCode/japanese-charset", "sonar.sourceEncoding", "Shift_JIS");
 
-    runSelenese(orchestrator, "/sourceCode/EncodingTest/japanese_sources.html");
+    tester.runHtmlTests("/sourceCode/EncodingTest/japanese_sources.html");
   }
 }
diff --git a/it/it-tests/src/test/java/it/sourceCode/HighlightingTest.java b/tests/src/test/java/org/sonarqube/tests/sourceCode/HighlightingTest.java
index 842782de649..6e682a74176 100644
--- a/it/it-tests/src/test/java/it/sourceCode/HighlightingTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/sourceCode/HighlightingTest.java
@@ -17,49 +17,46 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.sourceCode;
+package org.sonarqube.tests.sourceCode;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category1Suite;
-import org.junit.Before;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
+import org.sonarqube.tests.Tester;
 
 import static util.ItUtils.runProjectAnalysis;
-import static util.selenium.Selenese.runSelenese;
 
 public class HighlightingTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
-  @Before
-  public void deleteData() {
-    orchestrator.resetData();
-  }
+  @Rule
+  public Tester tester = new Tester(orchestrator).disableOrganizations();
 
   @Test
-  public void highlight_source_code_and_symbols_usage() throws Exception {
+  public void highlight_source_code_and_symbols_usage() {
     runProjectAnalysis(orchestrator, "highlighting/xoo-sample-with-highlighting-v2");
 
-    runSelenese(orchestrator,
-      // SONAR-3893 & SONAR-4247
-      "/sourceCode/HighlightingTest/syntax-highlighting.html",
-      // SONAR-4249 & SONAR-4250
-      "/sourceCode/HighlightingTest/symbol-usages-highlighting.html");
+    // SONAR-3893 & SONAR-4247
+    tester.runHtmlTests("/sourceCode/HighlightingTest/syntax-highlighting.html");
+
+    // SONAR-4249 & SONAR-4250
+    tester.runHtmlTests("/sourceCode/HighlightingTest/symbol-usages-highlighting.html");
   }
 
   // Check that E/S index is updated when file content is unchanged but plugin generates different syntax/symbol highlighting
   @Test
-  public void update_highlighting_even_when_code_unchanged() throws Exception {
+  public void update_highlighting_even_when_code_unchanged() {
     runProjectAnalysis(orchestrator, "highlighting/xoo-sample-with-highlighting-v1");
 
-    runSelenese(orchestrator, "/sourceCode/HighlightingTest/syntax-highlighting-v1.html");
+    tester.runHtmlTests("/sourceCode/HighlightingTest/syntax-highlighting-v1.html");
 
     runProjectAnalysis(orchestrator, "highlighting/xoo-sample-with-highlighting-v2");
 
-    runSelenese(orchestrator,
-      "/sourceCode/HighlightingTest/syntax-highlighting-v2.html",
-      "/sourceCode/HighlightingTest/symbol-usages-highlighting.html");
+    tester.runHtmlTests("/sourceCode/HighlightingTest/syntax-highlighting-v2.html");
+    tester.runHtmlTests("/sourceCode/HighlightingTest/symbol-usages-highlighting.html");
   }
 }
diff --git a/it/it-tests/src/test/java/it/sourceCode/ProjectCodeTest.java b/tests/src/test/java/org/sonarqube/tests/sourceCode/ProjectCodeTest.java
index 3306824c417..b79114be2ac 100644
--- a/it/it-tests/src/test/java/it/sourceCode/ProjectCodeTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/sourceCode/ProjectCodeTest.java
@@ -17,45 +17,48 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.sourceCode;
+package org.sonarqube.tests.sourceCode;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
+import org.sonarqube.tests.Tester;
 
 import static util.ItUtils.projectDir;
-import static util.selenium.Selenese.runSelenese;
 
 public class ProjectCodeTest {
 
   @ClassRule
   public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
+  @Rule
+  public Tester tester = new Tester(orchestrator).disableOrganizations();
+
   @Test
-  public void test_project_code_page() throws Exception {
+  public void test_project_code_page() {
     executeBuild("shared/xoo-sample", "project-for-code", "Project For Code");
 
-    runSelenese(orchestrator,
+    tester.runHtmlTests(
       "/sourceCode/ProjectCodeTest/test_project_code_page.html",
       "/sourceCode/ProjectCodeTest/search.html",
       "/sourceCode/ProjectCodeTest/permalink.html");
   }
 
   @Test
-  public void code_page_should_expand_root_dir() throws Exception {
+  public void code_page_should_expand_root_dir() {
     executeBuild("shared/xoo-sample-with-root-dir", "project-for-code-root-dir", "Project For Code");
 
-    runSelenese(orchestrator, "/sourceCode/ProjectCodeTest/code_page_should_expand_root_dir.html");
+    tester.runHtmlTests("/sourceCode/ProjectCodeTest/code_page_should_expand_root_dir.html");
   }
 
   private void executeBuild(String projectLocation, String projectKey, String projectName) {
     orchestrator.executeBuild(
       SonarScanner.create(projectDir(projectLocation))
         .setProjectKey(projectKey)
-        .setProjectName(projectName)
-    );
+        .setProjectName(projectName));
   }
 
 }
diff --git a/it/it-tests/src/test/java/it/test/CoverageTest.java b/tests/src/test/java/org/sonarqube/tests/test/CoverageTest.java
index 1dac8a4661a..1680429d0b0 100644
--- a/it/it-tests/src/test/java/it/test/CoverageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/test/CoverageTest.java
@@ -17,21 +17,22 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.test;
+package org.sonarqube.tests.test;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import java.io.File;
 import java.util.Map;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.filefilter.TrueFileFilter;
 import org.apache.commons.lang.StringUtils;
-import org.junit.Before;
 import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
+import org.sonarqube.tests.Tester;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.getMeasuresAsDoubleByMetricKey;
@@ -49,10 +50,8 @@ public class CoverageTest {
     "overall_coverage"
   };
 
-  @Before
-  public void delete_data() {
-    orchestrator.resetData();
-  }
+  @Rule
+  public Tester tester = new Tester(orchestrator).disableOrganizations();
 
   @Test
   public void coverage() throws Exception {
diff --git a/it/it-tests/src/test/java/it/test/CoverageTrackingTest.java b/tests/src/test/java/org/sonarqube/tests/test/CoverageTrackingTest.java
index f21cb852582..f6dd9b95355 100644
--- a/it/it-tests/src/test/java/it/test/CoverageTrackingTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/test/CoverageTrackingTest.java
@@ -17,18 +17,19 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.test;
+package org.sonarqube.tests.test;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.commons.io.IOUtils;
-import org.junit.Before;
 import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
+import org.sonarqube.tests.Tester;
 
 import static util.ItUtils.projectDir;
 
@@ -37,10 +38,8 @@ public class CoverageTrackingTest {
   @ClassRule
   public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
-  @Before
-  public void delete_data() {
-    orchestrator.resetData();
-  }
+  @Rule
+  public Tester tester = new Tester(orchestrator).disableOrganizations();
 
   @Test
   public void test_coverage_per_test() throws Exception {
diff --git a/it/it-tests/src/test/java/it/test/NewCoverageTest.java b/tests/src/test/java/org/sonarqube/tests/test/NewCoverageTest.java
index 827e2b3927f..6a331207e32 100644
--- a/it/it-tests/src/test/java/it/test/NewCoverageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/test/NewCoverageTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.test;
+package org.sonarqube.tests.test;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import java.util.Map;
 import org.assertj.core.data.Offset;
 import org.junit.BeforeClass;
diff --git a/it/it-tests/src/test/java/it/test/TestExecutionTest.java b/tests/src/test/java/org/sonarqube/tests/test/TestExecutionTest.java
index ec2e3a387d6..bb5edbb55f3 100644
--- a/it/it-tests/src/test/java/it/test/TestExecutionTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/test/TestExecutionTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.test;
+package org.sonarqube.tests.test;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category2Suite;
+import org.sonarqube.tests.Category2Suite;
 import java.util.Map;
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
diff --git a/it/it-tests/src/test/java/it/uiExtension/OrganizationUiExtensionsTest.java b/tests/src/test/java/org/sonarqube/tests/ui/OrganizationUiExtensionsTest.java
index 0dad2a29535..5198fc89062 100644
--- a/it/it-tests/src/test/java/it/uiExtension/OrganizationUiExtensionsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/ui/OrganizationUiExtensionsTest.java
@@ -17,16 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.uiExtension;
+package org.sonarqube.tests.ui;
 
 import com.codeborne.selenide.Condition;
 import com.sonar.orchestrator.Orchestrator;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openqa.selenium.By;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.Organizations.Organization;
 import org.sonarqube.ws.WsUsers.CreateWsResponse.User;
 
diff --git a/it/it-tests/src/test/java/it/ui/SourceViewerTest.java b/tests/src/test/java/org/sonarqube/tests/ui/SourceViewerTest.java
index 70f02288fff..64ff1451740 100644
--- a/it/it-tests/src/test/java/it/ui/SourceViewerTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/ui/SourceViewerTest.java
@@ -17,15 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.ui;
+package org.sonarqube.tests.ui;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.Navigation;
 
 import static com.codeborne.selenide.Condition.exist;
 import static com.codeborne.selenide.Selenide.$;
diff --git a/it/it-tests/src/test/java/it/uiExtension/UiExtensionsTest.java b/tests/src/test/java/org/sonarqube/tests/ui/UiExtensionsTest.java
index bd85a932725..db79e355e35 100644
--- a/it/it-tests/src/test/java/it/uiExtension/UiExtensionsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/ui/UiExtensionsTest.java
@@ -17,15 +17,15 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.uiExtension;
+package org.sonarqube.tests.ui;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openqa.selenium.By;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.WsProjects;
 import org.sonarqube.ws.WsUsers.CreateWsResponse.User;
 import org.sonarqube.ws.client.project.CreateRequest;
@@ -46,7 +46,7 @@ public class UiExtensionsTest {
 
   @Test
   public void test_static_files() {
-    tester.runHtmlTests("/uiExtension/UiExtensionsTest/static-files.html");
+    tester.runHtmlTests("/ui/UiExtensionsTest/static-files.html");
   }
 
   @Test
diff --git a/it/it-tests/src/test/java/it/ui/UiTest.java b/tests/src/test/java/org/sonarqube/tests/ui/UiTest.java
index c345140c517..ff4b65c0f14 100644
--- a/it/it-tests/src/test/java/it/ui/UiTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/ui/UiTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.ui;
+package org.sonarqube.tests.ui;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.util.Map;
 import org.junit.After;
 import org.junit.Before;
@@ -29,7 +29,7 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonarqube.ws.client.GetRequest;
 import org.sonarqube.ws.client.WsResponse;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.Navigation;
 import util.ItUtils;
 
 import static com.codeborne.selenide.Condition.hasText;
diff --git a/it/it-tests/src/test/java/it/updateCenter/UpdateCenterTest.java b/tests/src/test/java/org/sonarqube/tests/updateCenter/UpdateCenterTest.java
index f815034495f..a8f4d95b825 100644
--- a/it/it-tests/src/test/java/it/updateCenter/UpdateCenterTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/updateCenter/UpdateCenterTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.updateCenter;
+package org.sonarqube.tests.updateCenter;
 
 import com.sonar.orchestrator.Orchestrator;
 import org.junit.After;
diff --git a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/MssqlConfig.java b/tests/src/test/java/org/sonarqube/tests/upgrade/MssqlConfig.java
index 1c65a3e0d63..2d22485ef43 100644
--- a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/MssqlConfig.java
+++ b/tests/src/test/java/org/sonarqube/tests/upgrade/MssqlConfig.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.upgrade;
+package org.sonarqube.tests.upgrade;
 
 import com.sonar.orchestrator.config.Configuration;
 import com.sonar.orchestrator.version.Version;
diff --git a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/SelenideConfig.java b/tests/src/test/java/org/sonarqube/tests/upgrade/SelenideConfig.java
index 0e4c19e3f62..b67e99b5735 100644
--- a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/SelenideConfig.java
+++ b/tests/src/test/java/org/sonarqube/tests/upgrade/SelenideConfig.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.upgrade;
+package org.sonarqube.tests.upgrade;
 
 import com.codeborne.selenide.Configuration;
 import com.google.common.collect.ImmutableSet;
diff --git a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/ServerMigrationCall.java b/tests/src/test/java/org/sonarqube/tests/upgrade/ServerMigrationCall.java
index 1b198e1a265..8b55198410e 100644
--- a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/ServerMigrationCall.java
+++ b/tests/src/test/java/org/sonarqube/tests/upgrade/ServerMigrationCall.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.upgrade;
+package org.sonarqube.tests.upgrade;
 
 import com.sonar.orchestrator.Orchestrator;
 import java.text.ParseException;
diff --git a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/ServerMigrationResponse.java b/tests/src/test/java/org/sonarqube/tests/upgrade/ServerMigrationResponse.java
index 7b2815b1a98..1a24b0c5445 100644
--- a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/ServerMigrationResponse.java
+++ b/tests/src/test/java/org/sonarqube/tests/upgrade/ServerMigrationResponse.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.upgrade;
+package org.sonarqube.tests.upgrade;
 
 import java.util.Date;
 import javax.annotation.CheckForNull;
diff --git a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/ServerStatusCall.java b/tests/src/test/java/org/sonarqube/tests/upgrade/ServerStatusCall.java
index c42c1187e4b..d764cfd0bac 100644
--- a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/ServerStatusCall.java
+++ b/tests/src/test/java/org/sonarqube/tests/upgrade/ServerStatusCall.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.upgrade;
+package org.sonarqube.tests.upgrade;
 
 import com.sonar.orchestrator.Orchestrator;
 import javax.annotation.Nonnull;
diff --git a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/ServerStatusResponse.java b/tests/src/test/java/org/sonarqube/tests/upgrade/ServerStatusResponse.java
index 3ab7ecb8801..0ffcc3cfb4a 100644
--- a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/ServerStatusResponse.java
+++ b/tests/src/test/java/org/sonarqube/tests/upgrade/ServerStatusResponse.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.upgrade;
+package org.sonarqube.tests.upgrade;
 
 public class ServerStatusResponse {
   private final String id;
diff --git a/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeSuite.java b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeSuite.java
new file mode 100644
index 00000000000..efb4694299f
--- /dev/null
+++ b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeSuite.java
@@ -0,0 +1,30 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2017 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package org.sonarqube.tests.upgrade;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+  UpgradeTest.class
+})
+public class UpgradeSuite {
+}
diff --git a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/UpgradeTest.java b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java
index 6e3a45ec89b..83cf0c1ac91 100644
--- a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/UpgradeTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.upgrade;
+package org.sonarqube.tests.upgrade;
 
 import com.codeborne.selenide.Selenide;
 import com.codeborne.selenide.WebDriverRunner;
@@ -187,7 +187,7 @@ public class UpgradeTest {
 
   private void startDevServer() {
     OrchestratorBuilder builder = Orchestrator.builderEnv()
-      .setZipFile(FileLocation.byWildcardMavenFilename(new File("../../sonar-application/target"), "sonar*.zip").getFile())
+      .setZipFile(FileLocation.byWildcardMavenFilename(new File("../sonar-application/target"), "sonar*.zip").getFile())
       .setOrchestratorProperty("orchestrator.keepDatabase", "true")
       .setOrchestratorProperty("javaVersion", LATEST_JAVA_RELEASE)
       .addPlugin("java")
diff --git a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/WsCallAndWait.java b/tests/src/test/java/org/sonarqube/tests/upgrade/WsCallAndWait.java
index 9d76be45136..4e4fa645ea2 100644
--- a/tests/upgrade/src/test/java/org/sonarsource/sonarqube/upgrade/WsCallAndWait.java
+++ b/tests/src/test/java/org/sonarqube/tests/upgrade/WsCallAndWait.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonarsource.sonarqube.upgrade;
+package org.sonarqube.tests.upgrade;
 
 import com.sonar.orchestrator.Orchestrator;
 import javax.annotation.CheckForNull;
diff --git a/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java b/tests/src/test/java/org/sonarqube/tests/user/BaseIdentityProviderTest.java
index 391b2d892e5..65cd095d285 100644
--- a/it/it-tests/src/test/java/it/user/BaseIdentityProviderTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/user/BaseIdentityProviderTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.user;
+package org.sonarqube.tests.user;
 
 import com.google.common.base.Joiner;
 import com.google.common.base.Optional;
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.io.File;
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
@@ -33,7 +33,7 @@ import org.junit.Test;
 import org.sonarqube.ws.client.GetRequest;
 import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.user.CreateRequest;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.Navigation;
 import util.user.UserRule;
 import util.user.Users;
 
diff --git a/it/it-tests/src/test/java/it/user/FavoritesWsTest.java b/tests/src/test/java/org/sonarqube/tests/user/FavoritesWsTest.java
index f161e53372d..fbcd3181ad3 100644
--- a/it/it-tests/src/test/java/it/user/FavoritesWsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/user/FavoritesWsTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.user;
+package org.sonarqube.tests.user;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.util.List;
 import org.junit.Before;
 import org.junit.ClassRule;
diff --git a/it/it-tests/src/test/java/it/user/ForceAuthenticationTest.java b/tests/src/test/java/org/sonarqube/tests/user/ForceAuthenticationTest.java
index a67756b43f1..1f0ae8f71ee 100644
--- a/it/it-tests/src/test/java/it/user/ForceAuthenticationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/user/ForceAuthenticationTest.java
@@ -17,16 +17,16 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.user;
+package org.sonarqube.tests.user;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.WsUsers.CreateWsResponse.User;
 import org.sonarqube.ws.client.GetRequest;
 import org.sonarqube.ws.client.PostRequest;
@@ -34,7 +34,7 @@ import org.sonarqube.ws.client.WsClient;
 import org.sonarqube.ws.client.WsConnector;
 import org.sonarqube.ws.client.WsRequest;
 import org.sonarqube.ws.client.WsResponse;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.Navigation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonarqube.ws.client.WsRequest.Method.GET;
diff --git a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java b/tests/src/test/java/org/sonarqube/tests/user/LocalAuthenticationTest.java
index dc6d2b0298e..3f53ba7145b 100644
--- a/it/it-tests/src/test/java/it/user/LocalAuthenticationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/user/LocalAuthenticationTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.user;
+package org.sonarqube.tests.user;
 
 import com.codeborne.selenide.Condition;
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.util.UUID;
 import org.junit.After;
 import org.junit.Before;
@@ -29,7 +29,7 @@ import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.WsUserTokens;
 import org.sonarqube.ws.client.GetRequest;
 import org.sonarqube.ws.client.HttpConnector;
@@ -42,8 +42,8 @@ import org.sonarqube.ws.client.usertoken.GenerateWsRequest;
 import org.sonarqube.ws.client.usertoken.RevokeWsRequest;
 import org.sonarqube.ws.client.usertoken.SearchWsRequest;
 import org.sonarqube.ws.client.usertoken.UserTokensService;
-import pageobjects.LoginPage;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.LoginPage;
+import org.sonarqube.pageobjects.Navigation;
 
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/it/it-tests/src/test/java/it/user/MyAccountPageTest.java b/tests/src/test/java/org/sonarqube/tests/user/MyAccountPageTest.java
index 6d8b8105686..de2c4a992d3 100644
--- a/it/it-tests/src/test/java/it/user/MyAccountPageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/user/MyAccountPageTest.java
@@ -17,19 +17,19 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.user;
+package org.sonarqube.tests.user;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.WsUsers.CreateWsResponse.User;
 import org.sonarqube.ws.client.PostRequest;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.Navigation;
 
 import static com.codeborne.selenide.Condition.text;
 import static com.codeborne.selenide.Condition.visible;
diff --git a/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java b/tests/src/test/java/org/sonarqube/tests/user/OAuth2IdentityProviderTest.java
index 91a58eefe5b..642a7351ccd 100644
--- a/it/it-tests/src/test/java/it/user/OAuth2IdentityProviderTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/user/OAuth2IdentityProviderTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.user;
+package org.sonarqube.tests.user;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import java.io.File;
 import java.net.HttpURLConnection;
 import okhttp3.mockwebserver.MockResponse;
@@ -31,12 +31,12 @@ import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.WsUsers.SearchWsResponse.User;
 import org.sonarqube.ws.client.GetRequest;
 import org.sonarqube.ws.client.WsResponse;
 import org.sonarqube.ws.client.user.CreateRequest;
-import pageobjects.Navigation;
+import org.sonarqube.pageobjects.Navigation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.resetSettings;
diff --git a/it/it-tests/src/test/java/it/user/OnboardingTest.java b/tests/src/test/java/org/sonarqube/tests/user/OnboardingTest.java
index e0a277a812a..205e17d10ab 100644
--- a/it/it-tests/src/test/java/it/user/OnboardingTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/user/OnboardingTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.user;
+package org.sonarqube.tests.user;
 
 import com.sonar.orchestrator.Orchestrator;
 import org.junit.After;
@@ -25,7 +25,7 @@ import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.WsUsers.CreateWsResponse.User;
 import org.sonarqube.ws.client.WsClient;
 import util.ItUtils;
diff --git a/it/it-tests/src/test/java/it/user/OrganizationIdentityProviderTest.java b/tests/src/test/java/org/sonarqube/tests/user/OrganizationIdentityProviderTest.java
index d59f5651477..767c76f70db 100644
--- a/it/it-tests/src/test/java/it/user/OrganizationIdentityProviderTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/user/OrganizationIdentityProviderTest.java
@@ -17,17 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.user;
+package org.sonarqube.tests.user;
 
 import com.google.common.base.Joiner;
 import com.sonar.orchestrator.Orchestrator;
-import it.Category6Suite;
+import org.sonarqube.tests.Category6Suite;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.WsUserGroups.Group;
 import org.sonarqube.ws.WsUsers.CreateWsResponse.User;
 import org.sonarqube.ws.client.GetRequest;
diff --git a/it/it-tests/src/test/java/it/user/RealmAuthenticationTest.java b/tests/src/test/java/org/sonarqube/tests/user/RealmAuthenticationTest.java
index bb8fb26b857..5e4170fceb1 100644
--- a/it/it-tests/src/test/java/it/user/RealmAuthenticationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/user/RealmAuthenticationTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.user;
+package org.sonarqube.tests.user;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
diff --git a/it/it-tests/src/test/java/it/user/SsoAuthenticationTest.java b/tests/src/test/java/org/sonarqube/tests/user/SsoAuthenticationTest.java
index fdd127d56df..2860b09dfb7 100644
--- a/it/it-tests/src/test/java/it/user/SsoAuthenticationTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/user/SsoAuthenticationTest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.user;
+package org.sonarqube.tests.user;
 
 import com.sonar.orchestrator.Orchestrator;
 import java.net.URLEncoder;
diff --git a/it/it-tests/src/test/java/it/administration/UsersPageTest.java b/tests/src/test/java/org/sonarqube/tests/user/UsersPageTest.java
index 9779a6f82f9..b983b0e69e0 100644
--- a/it/it-tests/src/test/java/it/administration/UsersPageTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/user/UsersPageTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.administration;
+package org.sonarqube.tests.user;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category1Suite;
+import org.sonarqube.tests.Category1Suite;
 import java.util.List;
 import org.junit.After;
 import org.junit.Before;
@@ -61,12 +61,12 @@ public class UsersPageTest {
 
   @Test
   public void generate_and_revoke_user_token()  {
-    Selenese.runSelenese(orchestrator, "/administration/UsersPageTest/generate_and_revoke_user_token.html");
+    Selenese.runSelenese(orchestrator, "/user/UsersPageTest/generate_and_revoke_user_token.html");
   }
 
   @Test
-  public void admin_should_change_its_own_password()  {
-    Selenese.runSelenese(orchestrator, "/administration/UsersPageTest/admin_should_change_its_own_password.html");
+  public void admin_should_change_his_own_password()  {
+    Selenese.runSelenese(orchestrator, "/user/UsersPageTest/admin_should_change_its_own_password.html");
   }
 
   @Test
diff --git a/it/it-tests/src/test/java/it/webhook/ExternalServer.java b/tests/src/test/java/org/sonarqube/tests/webhook/ExternalServer.java
index 60485e25e25..33301c85e3b 100644
--- a/it/it-tests/src/test/java/it/webhook/ExternalServer.java
+++ b/tests/src/test/java/org/sonarqube/tests/webhook/ExternalServer.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.webhook;
+package org.sonarqube.tests.webhook;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/it/it-tests/src/test/java/it/webhook/PayloadRequest.java b/tests/src/test/java/org/sonarqube/tests/webhook/PayloadRequest.java
index 857a76fa4fe..e641e71648d 100644
--- a/it/it-tests/src/test/java/it/webhook/PayloadRequest.java
+++ b/tests/src/test/java/org/sonarqube/tests/webhook/PayloadRequest.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.webhook;
+package org.sonarqube.tests.webhook;
 
 import java.util.Map;
 
diff --git a/it/it-tests/src/test/java/it/webhook/WebhooksTest.java b/tests/src/test/java/org/sonarqube/tests/webhook/WebhooksTest.java
index d1b5390bcf2..975a5dc9366 100644
--- a/it/it-tests/src/test/java/it/webhook/WebhooksTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/webhook/WebhooksTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.webhook;
+package org.sonarqube.tests.webhook;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category3Suite;
+import org.sonarqube.tests.Category3Suite;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
diff --git a/it/it-tests/src/test/java/it/ws/RoutesTest.java b/tests/src/test/java/org/sonarqube/tests/ws/RoutesTest.java
index 36c393f3b9c..6db3a4d30b6 100644
--- a/it/it-tests/src/test/java/it/ws/RoutesTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/ws/RoutesTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.ws;
+package org.sonarqube.tests.ws;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonarqube.ws.client.GetRequest;
diff --git a/it/it-tests/src/test/java/it/ws/WsLocalCallTest.java b/tests/src/test/java/org/sonarqube/tests/ws/WsLocalCallTest.java
index 8f4a54af78b..8e822e286dd 100644
--- a/it/it-tests/src/test/java/it/ws/WsLocalCallTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/ws/WsLocalCallTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.ws;
+package org.sonarqube.tests.ws;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonarqube.ws.client.GetRequest;
diff --git a/it/it-tests/src/test/java/it/ws/WsTest.java b/tests/src/test/java/org/sonarqube/tests/ws/WsTest.java
index cdfc7ac84cb..50fdd7758c5 100644
--- a/it/it-tests/src/test/java/it/ws/WsTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/ws/WsTest.java
@@ -17,10 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package it.ws;
+package org.sonarqube.tests.ws;
 
 import com.sonar.orchestrator.Orchestrator;
-import it.Category4Suite;
+import org.sonarqube.tests.Category4Suite;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonarqube.ws.client.GetRequest;
diff --git a/it/it-tests/src/test/java/util/ItUtils.java b/tests/src/test/java/util/ItUtils.java
index a8e5ee495e0..3ef0d275549 100644
--- a/it/it-tests/src/test/java/util/ItUtils.java
+++ b/tests/src/test/java/util/ItUtils.java
@@ -61,7 +61,7 @@ import org.junit.Assert;
 import org.sonar.wsclient.issue.Issue;
 import org.sonar.wsclient.issue.IssueClient;
 import org.sonar.wsclient.issue.IssueQuery;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 import org.sonarqube.ws.WsComponents.Component;
 import org.sonarqube.ws.WsMeasures;
 import org.sonarqube.ws.WsMeasures.Measure;
@@ -93,7 +93,7 @@ public class ItUtils {
   }
 
   public static FileLocation xooPlugin() {
-    return FileLocation.byWildcardMavenFilename(new File("../../plugins/sonar-xoo-plugin/target"), "sonar-xoo-plugin-*.jar");
+    return FileLocation.byWildcardMavenFilename(new File("../plugins/sonar-xoo-plugin/target"), "sonar-xoo-plugin-*.jar");
   }
 
   public static List<Issue> getAllServerIssues(Orchestrator orchestrator) {
@@ -132,10 +132,10 @@ public class ItUtils {
   /**
    * Locate the directory of sample project
    *
-   * @param relativePath path related to the directory it/it-projects, for example "qualitygate/xoo-sample"
+   * @param relativePath path related to the directory it/projects, for example "qualitygate/xoo-sample"
    */
   public static File projectDir(String relativePath) {
-    File dir = new File("../it-projects/" + relativePath);
+    File dir = new File("projects/" + relativePath);
     if (!dir.exists() || !dir.isDirectory()) {
       throw new IllegalStateException("Directory does not exist: " + dir.getAbsolutePath());
     }
@@ -143,19 +143,19 @@ public class ItUtils {
   }
 
   /**
-   * Locate the artifact of a fake plugin stored in it/it-plugins.
+   * Locate the artifact of a fake plugin stored in it/plugins.
    *
-   * @param dirName the directory of it/it-plugins, for example "sonar-fake-plugin".
+   * @param dirName the directory of it/plugins, for example "sonar-fake-plugin".
    *                     It assumes that version is 1.0-SNAPSHOT
    */
   public static FileLocation pluginArtifact(String dirName) {
-    return FileLocation.byWildcardMavenFilename(new File("../it-plugins/" + dirName + "/target"), dirName + "-*.jar");
+    return FileLocation.byWildcardMavenFilename(new File("plugins/" + dirName + "/target"), dirName + "-*.jar");
   }
 
   /**
    * Locate the pom file of a sample project
    *
-   * @param projectName project path related to the directory it/it-projects, for example "qualitygate/xoo-sample"
+   * @param projectName project path related to the directory it/projects, for example "qualitygate/xoo-sample"
    */
   public static File projectPom(String projectName) {
     File pom = new File(projectDir(projectName), "pom.xml");
diff --git a/it/it-tests/src/test/java/util/LoadedProfiles.java b/tests/src/test/java/util/LoadedProfiles.java
index 71c76803901..71c76803901 100644
--- a/it/it-tests/src/test/java/util/LoadedProfiles.java
+++ b/tests/src/test/java/util/LoadedProfiles.java
diff --git a/it/it-tests/src/test/java/util/LoadedProjects.java b/tests/src/test/java/util/LoadedProjects.java
index eb3565f5f84..eb3565f5f84 100644
--- a/it/it-tests/src/test/java/util/LoadedProjects.java
+++ b/tests/src/test/java/util/LoadedProjects.java
diff --git a/it/it-tests/src/test/java/util/Profile.java b/tests/src/test/java/util/Profile.java
index f9f6a78c52a..f9f6a78c52a 100644
--- a/it/it-tests/src/test/java/util/Profile.java
+++ b/tests/src/test/java/util/Profile.java
diff --git a/it/it-tests/src/test/java/util/ProjectAnalysis.java b/tests/src/test/java/util/ProjectAnalysis.java
index e60f4c37704..e60f4c37704 100644
--- a/it/it-tests/src/test/java/util/ProjectAnalysis.java
+++ b/tests/src/test/java/util/ProjectAnalysis.java
diff --git a/it/it-tests/src/test/java/util/ProjectAnalysisRule.java b/tests/src/test/java/util/ProjectAnalysisRule.java
index 9483bb79ed8..89debd0c066 100644
--- a/it/it-tests/src/test/java/util/ProjectAnalysisRule.java
+++ b/tests/src/test/java/util/ProjectAnalysisRule.java
@@ -83,7 +83,7 @@ public class ProjectAnalysisRule extends ExternalResource {
   }
 
   /**
-   * @param projectRelativePath path relative to it/it-projects, eg. "shared/xoo-multi-modules-sample"
+   * @param projectRelativePath path relative to it/projects, eg. "shared/xoo-multi-modules-sample"
    *
    * @return the project key
    */
diff --git a/it/it-tests/src/test/java/util/ProjectState.java b/tests/src/test/java/util/ProjectState.java
index cfa310326b4..cfa310326b4 100644
--- a/it/it-tests/src/test/java/util/ProjectState.java
+++ b/tests/src/test/java/util/ProjectState.java
diff --git a/it/it-tests/src/test/java/util/issue/IssueRule.java b/tests/src/test/java/util/issue/IssueRule.java
index 7857d3cabdc..7857d3cabdc 100644
--- a/it/it-tests/src/test/java/util/issue/IssueRule.java
+++ b/tests/src/test/java/util/issue/IssueRule.java
diff --git a/it/it-tests/src/test/java/util/selenium/ByCssSelectorOrByNameOrById.java b/tests/src/test/java/util/selenium/ByCssSelectorOrByNameOrById.java
index 364ba779d6e..364ba779d6e 100644
--- a/it/it-tests/src/test/java/util/selenium/ByCssSelectorOrByNameOrById.java
+++ b/tests/src/test/java/util/selenium/ByCssSelectorOrByNameOrById.java
diff --git a/it/it-tests/src/test/java/util/selenium/Consumer.java b/tests/src/test/java/util/selenium/Consumer.java
index 69009893a97..69009893a97 100644
--- a/it/it-tests/src/test/java/util/selenium/Consumer.java
+++ b/tests/src/test/java/util/selenium/Consumer.java
diff --git a/it/it-tests/src/test/java/util/selenium/ElementFilter.java b/tests/src/test/java/util/selenium/ElementFilter.java
index 86b42cfa826..86b42cfa826 100644
--- a/it/it-tests/src/test/java/util/selenium/ElementFilter.java
+++ b/tests/src/test/java/util/selenium/ElementFilter.java
diff --git a/it/it-tests/src/test/java/util/selenium/Failure.java b/tests/src/test/java/util/selenium/Failure.java
index 8ba36543820..8ba36543820 100644
--- a/it/it-tests/src/test/java/util/selenium/Failure.java
+++ b/tests/src/test/java/util/selenium/Failure.java
diff --git a/it/it-tests/src/test/java/util/selenium/LazyDomElement.java b/tests/src/test/java/util/selenium/LazyDomElement.java
index 27c5199f820..27c5199f820 100644
--- a/it/it-tests/src/test/java/util/selenium/LazyDomElement.java
+++ b/tests/src/test/java/util/selenium/LazyDomElement.java
diff --git a/it/it-tests/src/test/java/util/selenium/LazyShould.java b/tests/src/test/java/util/selenium/LazyShould.java
index c880a7d944b..c880a7d944b 100644
--- a/it/it-tests/src/test/java/util/selenium/LazyShould.java
+++ b/tests/src/test/java/util/selenium/LazyShould.java
diff --git a/it/it-tests/src/test/java/util/selenium/Optional.java b/tests/src/test/java/util/selenium/Optional.java
index 918d488a85f..918d488a85f 100644
--- a/it/it-tests/src/test/java/util/selenium/Optional.java
+++ b/tests/src/test/java/util/selenium/Optional.java
diff --git a/it/it-tests/src/test/java/util/selenium/Retry.java b/tests/src/test/java/util/selenium/Retry.java
index 7cc8a20897c..7cc8a20897c 100644
--- a/it/it-tests/src/test/java/util/selenium/Retry.java
+++ b/tests/src/test/java/util/selenium/Retry.java
diff --git a/it/it-tests/src/test/java/util/selenium/Selenese.java b/tests/src/test/java/util/selenium/Selenese.java
index 4e01674e59b..187e33d9024 100644
--- a/it/it-tests/src/test/java/util/selenium/Selenese.java
+++ b/tests/src/test/java/util/selenium/Selenese.java
@@ -23,7 +23,7 @@ import com.sonar.orchestrator.Orchestrator;
 import java.io.File;
 import javax.annotation.Nullable;
 import org.apache.commons.io.FileUtils;
-import org.sonarqube.test.Tester;
+import org.sonarqube.tests.Tester;
 
 /**
  * Selenium HTML tests, generally written with Selenium IDE
diff --git a/it/it-tests/src/test/java/util/selenium/SeleneseRunner.java b/tests/src/test/java/util/selenium/SeleneseRunner.java
index cefc5c6ef09..96cc4e609a2 100644
--- a/it/it-tests/src/test/java/util/selenium/SeleneseRunner.java
+++ b/tests/src/test/java/util/selenium/SeleneseRunner.java
@@ -39,7 +39,7 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.logging.LogEntries;
 import org.openqa.selenium.logging.LogEntry;
 import org.openqa.selenium.logging.LogType;
-import pageobjects.SelenideConfig;
+import org.sonarqube.pageobjects.SelenideConfig;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
diff --git a/it/it-tests/src/test/java/util/selenium/Text.java b/tests/src/test/java/util/selenium/Text.java
index 5f3b8d259ce..5f3b8d259ce 100644
--- a/it/it-tests/src/test/java/util/selenium/Text.java
+++ b/tests/src/test/java/util/selenium/Text.java
diff --git a/it/it-tests/src/test/java/util/selenium/WebElementHelper.java b/tests/src/test/java/util/selenium/WebElementHelper.java
index edb9d9dccb5..edb9d9dccb5 100644
--- a/it/it-tests/src/test/java/util/selenium/WebElementHelper.java
+++ b/tests/src/test/java/util/selenium/WebElementHelper.java
diff --git a/it/it-tests/src/test/java/util/user/GroupManagement.java b/tests/src/test/java/util/user/GroupManagement.java
index 17d526456f2..41b362f3e0a 100644
--- a/it/it-tests/src/test/java/util/user/GroupManagement.java
+++ b/tests/src/test/java/util/user/GroupManagement.java
@@ -24,7 +24,7 @@ import java.util.Optional;
 import javax.annotation.Nullable;
 
 /**
- * @deprecated replaced by {@link org.sonarqube.test.Tester}
+ * @deprecated replaced by {@link org.sonarqube.tests.Tester}
  */
 @Deprecated
 public interface GroupManagement {
diff --git a/it/it-tests/src/test/java/util/user/Groups.java b/tests/src/test/java/util/user/Groups.java
index 5856352a447..7b87547bc17 100644
--- a/it/it-tests/src/test/java/util/user/Groups.java
+++ b/tests/src/test/java/util/user/Groups.java
@@ -23,7 +23,7 @@ import com.google.gson.Gson;
 import java.util.List;
 
 /**
- * @deprecated replaced by {@link org.sonarqube.test.Tester}
+ * @deprecated replaced by {@link org.sonarqube.tests.Tester}
  */
 @Deprecated
 
diff --git a/it/it-tests/src/test/java/util/user/UserRule.java b/tests/src/test/java/util/user/UserRule.java
index 96f67c4a879..fe93e631c01 100644
--- a/it/it-tests/src/test/java/util/user/UserRule.java
+++ b/tests/src/test/java/util/user/UserRule.java
@@ -51,7 +51,7 @@ import static org.assertj.guava.api.Assertions.assertThat;
 import static util.ItUtils.newAdminWsClient;
 
 /**
- * @deprecated replaced by {@link org.sonarqube.test.Tester}
+ * @deprecated replaced by {@link org.sonarqube.tests.Tester}
  */
 @Deprecated
 public class UserRule extends ExternalResource implements GroupManagement {
diff --git a/it/it-tests/src/test/java/util/user/Users.java b/tests/src/test/java/util/user/Users.java
index 2f0a252e6c7..2f0a252e6c7 100644
--- a/it/it-tests/src/test/java/util/user/Users.java
+++ b/tests/src/test/java/util/user/Users.java
diff --git a/it/it-tests/src/test/resources/analysis/BatchTest/one-issue-per-line.xml b/tests/src/test/resources/analysis/BatchTest/one-issue-per-line.xml
index 7bb4ed5593a..7bb4ed5593a 100644
--- a/it/it-tests/src/test/resources/analysis/BatchTest/one-issue-per-line.xml
+++ b/tests/src/test/resources/analysis/BatchTest/one-issue-per-line.xml
diff --git a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/multiline.xml b/tests/src/test/resources/analysis/IssueJsonReportTest/multiline.xml
index 778866e91c2..778866e91c2 100644
--- a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/multiline.xml
+++ b/tests/src/test/resources/analysis/IssueJsonReportTest/multiline.xml
diff --git a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/no-server-analysis.json b/tests/src/test/resources/analysis/IssueJsonReportTest/no-server-analysis.json
index 4e1b18df6ee..4e1b18df6ee 100644
--- a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/no-server-analysis.json
+++ b/tests/src/test/resources/analysis/IssueJsonReportTest/no-server-analysis.json
diff --git a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/one-issue-per-line.xml b/tests/src/test/resources/analysis/IssueJsonReportTest/one-issue-per-line.xml
index 7bb4ed5593a..7bb4ed5593a 100644
--- a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/one-issue-per-line.xml
+++ b/tests/src/test/resources/analysis/IssueJsonReportTest/one-issue-per-line.xml
diff --git a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-root-module.json b/tests/src/test/resources/analysis/IssueJsonReportTest/report-on-root-module.json
index ad3c0218cdb..ad3c0218cdb 100644
--- a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-root-module.json
+++ b/tests/src/test/resources/analysis/IssueJsonReportTest/report-on-root-module.json
diff --git a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-single-module-branch.json b/tests/src/test/resources/analysis/IssueJsonReportTest/report-on-single-module-branch.json
index aa066bbbf2f..aa066bbbf2f 100644
--- a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-single-module-branch.json
+++ b/tests/src/test/resources/analysis/IssueJsonReportTest/report-on-single-module-branch.json
diff --git a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-single-module.json b/tests/src/test/resources/analysis/IssueJsonReportTest/report-on-single-module.json
index 6c3aab91f02..6c3aab91f02 100644
--- a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-single-module.json
+++ b/tests/src/test/resources/analysis/IssueJsonReportTest/report-on-single-module.json
diff --git a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-sub-module.json b/tests/src/test/resources/analysis/IssueJsonReportTest/report-on-sub-module.json
index 84a68c4d5a4..84a68c4d5a4 100644
--- a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-sub-module.json
+++ b/tests/src/test/resources/analysis/IssueJsonReportTest/report-on-sub-module.json
diff --git a/it/it-tests/src/test/resources/analysis/IssuesModeTest/empty.xml b/tests/src/test/resources/analysis/IssuesModeTest/empty.xml
index 8bab61d6c85..8bab61d6c85 100644
--- a/it/it-tests/src/test/resources/analysis/IssuesModeTest/empty.xml
+++ b/tests/src/test/resources/analysis/IssuesModeTest/empty.xml
diff --git a/it/it-tests/src/test/resources/analysis/IssuesModeTest/one-issue-per-line-empty.xml b/tests/src/test/resources/analysis/IssuesModeTest/one-issue-per-line-empty.xml
index 0ba34f10dbd..0ba34f10dbd 100644
--- a/it/it-tests/src/test/resources/analysis/IssuesModeTest/one-issue-per-line-empty.xml
+++ b/tests/src/test/resources/analysis/IssuesModeTest/one-issue-per-line-empty.xml
diff --git a/it/it-tests/src/test/resources/analysis/IssuesModeTest/one-issue-per-line.xml b/tests/src/test/resources/analysis/IssuesModeTest/one-issue-per-line.xml
index 7bb4ed5593a..7bb4ed5593a 100644
--- a/it/it-tests/src/test/resources/analysis/IssuesModeTest/one-issue-per-line.xml
+++ b/tests/src/test/resources/analysis/IssuesModeTest/one-issue-per-line.xml
diff --git a/it/it-tests/src/test/resources/analysis/IssuesModeTest/with-many-rules.xml b/tests/src/test/resources/analysis/IssuesModeTest/with-many-rules.xml
index f3d0baf0616..f3d0baf0616 100644
--- a/it/it-tests/src/test/resources/analysis/IssuesModeTest/with-many-rules.xml
+++ b/tests/src/test/resources/analysis/IssuesModeTest/with-many-rules.xml
diff --git a/it/it-tests/src/test/resources/analysis/MultiLanguageTest/one-issue-per-line-xoo2.xml b/tests/src/test/resources/analysis/MultiLanguageTest/one-issue-per-line-xoo2.xml
index 67215f91a52..67215f91a52 100644
--- a/it/it-tests/src/test/resources/analysis/MultiLanguageTest/one-issue-per-line-xoo2.xml
+++ b/tests/src/test/resources/analysis/MultiLanguageTest/one-issue-per-line-xoo2.xml
diff --git a/it/it-tests/src/test/resources/analysis/MultiLanguageTest/one-issue-per-line.xml b/tests/src/test/resources/analysis/MultiLanguageTest/one-issue-per-line.xml
index 7bb4ed5593a..7bb4ed5593a 100644
--- a/it/it-tests/src/test/resources/analysis/MultiLanguageTest/one-issue-per-line.xml
+++ b/tests/src/test/resources/analysis/MultiLanguageTest/one-issue-per-line.xml
diff --git a/it/it-tests/src/test/resources/analysis/SSLTest/README b/tests/src/test/resources/analysis/SSLTest/README
index fb535a907c6..fb535a907c6 100644
--- a/it/it-tests/src/test/resources/analysis/SSLTest/README
+++ b/tests/src/test/resources/analysis/SSLTest/README
diff --git a/it/it-tests/src/test/resources/analysis/SSLTest/clientkeystore.jks b/tests/src/test/resources/analysis/SSLTest/clientkeystore.jks
index 653f3c7f093..653f3c7f093 100644
--- a/it/it-tests/src/test/resources/analysis/SSLTest/clientkeystore.jks
+++ b/tests/src/test/resources/analysis/SSLTest/clientkeystore.jks
diff --git a/it/it-tests/src/test/resources/analysis/SSLTest/clienttruststore.jks b/tests/src/test/resources/analysis/SSLTest/clienttruststore.jks
index 2529245e1c6..2529245e1c6 100644
--- a/it/it-tests/src/test/resources/analysis/SSLTest/clienttruststore.jks
+++ b/tests/src/test/resources/analysis/SSLTest/clienttruststore.jks
diff --git a/it/it-tests/src/test/resources/analysis/SSLTest/openssl.cnf b/tests/src/test/resources/analysis/SSLTest/openssl.cnf
index 4a5148fd4d7..4a5148fd4d7 100644
--- a/it/it-tests/src/test/resources/analysis/SSLTest/openssl.cnf
+++ b/tests/src/test/resources/analysis/SSLTest/openssl.cnf
diff --git a/it/it-tests/src/test/resources/analysis/SSLTest/serverkeystore.jks b/tests/src/test/resources/analysis/SSLTest/serverkeystore.jks
index 319c899278a..319c899278a 100644
--- a/it/it-tests/src/test/resources/analysis/SSLTest/serverkeystore.jks
+++ b/tests/src/test/resources/analysis/SSLTest/serverkeystore.jks
diff --git a/it/it-tests/src/test/resources/analysis/SSLTest/servertruststore.jks b/tests/src/test/resources/analysis/SSLTest/servertruststore.jks
index a3aee3b8a9d..a3aee3b8a9d 100644
--- a/it/it-tests/src/test/resources/analysis/SSLTest/servertruststore.jks
+++ b/tests/src/test/resources/analysis/SSLTest/servertruststore.jks
diff --git a/it/it-tests/src/test/resources/analysis/SettingsEncryptionTest/sonar-secret.txt b/tests/src/test/resources/analysis/SettingsEncryptionTest/sonar-secret.txt
index 65b98c522da..65b98c522da 100644
--- a/it/it-tests/src/test/resources/analysis/SettingsEncryptionTest/sonar-secret.txt
+++ b/tests/src/test/resources/analysis/SettingsEncryptionTest/sonar-secret.txt
diff --git a/it/it-tests/src/test/resources/analysis/TempFolderTest/one-issue-per-line.xml b/tests/src/test/resources/analysis/TempFolderTest/one-issue-per-line.xml
index 7bb4ed5593a..7bb4ed5593a 100644
--- a/it/it-tests/src/test/resources/analysis/TempFolderTest/one-issue-per-line.xml
+++ b/tests/src/test/resources/analysis/TempFolderTest/one-issue-per-line.xml
diff --git a/it/it-tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_create.html b/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_create.html
index 0e67e0f4fab..0e67e0f4fab 100644
--- a/it/it-tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_create.html
+++ b/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_create.html
diff --git a/it/it-tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_display_page.html b/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_display_page.html
index 8d9640f25b6..8d9640f25b6 100644
--- a/it/it-tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_display_page.html
+++ b/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_display_page.html
diff --git a/it/it-tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_manage_project_creators.html b/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_manage_project_creators.html
index 3d1c172a783..3d1c172a783 100644
--- a/it/it-tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_manage_project_creators.html
+++ b/tests/src/test/resources/authorisation/PermissionTemplatesPageTest/should_manage_project_creators.html
diff --git a/it/it-tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-be-able-to-provision-project.html b/tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-be-able-to-provision-project.html
index c5db3b4898a..c5db3b4898a 100644
--- a/it/it-tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-be-able-to-provision-project.html
+++ b/tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-be-able-to-provision-project.html
diff --git a/it/it-tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-not-be-able-to-provision-project.html b/tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-not-be-able-to-provision-project.html
index 270daf67cd9..270daf67cd9 100644
--- a/it/it-tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-not-be-able-to-provision-project.html
+++ b/tests/src/test/resources/authorisation/ProvisioningPermissionTest/should-not-be-able-to-provision-project.html
diff --git a/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/normal-user.html b/tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/normal-user.html
index b9190a27027..b9190a27027 100644
--- a/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/normal-user.html
+++ b/tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/normal-user.html
diff --git a/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/profile-admin.html b/tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/profile-admin.html
index 86d6b26ece8..86d6b26ece8 100644
--- a/it/it-tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/profile-admin.html
+++ b/tests/src/test/resources/authorisation/QualityProfileAdminPermissionTest/profile-admin.html
diff --git a/it/it-tests/src/test/resources/authorisation/one-issue-per-line-profile.xml b/tests/src/test/resources/authorisation/one-issue-per-line-profile.xml
index 521adc7e06f..521adc7e06f 100644
--- a/it/it-tests/src/test/resources/authorisation/one-issue-per-line-profile.xml
+++ b/tests/src/test/resources/authorisation/one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/dbCleaner/one-issue-per-line-profile.xml b/tests/src/test/resources/dbCleaner/one-issue-per-line-profile.xml
index 2006b6fb365..2006b6fb365 100644
--- a/it/it-tests/src/test/resources/dbCleaner/one-issue-per-line-profile.xml
+++ b/tests/src/test/resources/dbCleaner/one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/duplication/CrossProjectDuplicationsOnRemoveFileTest/duplications-with-deleted-project.html b/tests/src/test/resources/duplication/CrossProjectDuplicationsOnRemoveFileTest/duplications-with-deleted-project.html
index 37a48368f83..37a48368f83 100644
--- a/it/it-tests/src/test/resources/duplication/CrossProjectDuplicationsOnRemoveFileTest/duplications-with-deleted-project.html
+++ b/tests/src/test/resources/duplication/CrossProjectDuplicationsOnRemoveFileTest/duplications-with-deleted-project.html
diff --git a/it/it-tests/src/test/resources/duplication/CrossProjectDuplicationsOnRemoveFileTest/duplications_on_removed_file-expected.json b/tests/src/test/resources/duplication/CrossProjectDuplicationsOnRemoveFileTest/duplications_on_removed_file-expected.json
index 37f0e402120..37f0e402120 100644
--- a/it/it-tests/src/test/resources/duplication/CrossProjectDuplicationsOnRemoveFileTest/duplications_on_removed_file-expected.json
+++ b/tests/src/test/resources/duplication/CrossProjectDuplicationsOnRemoveFileTest/duplications_on_removed_file-expected.json
diff --git a/it/it-tests/src/test/resources/duplication/CrossProjectDuplicationsTest/cross-project-duplications-viewer.html b/tests/src/test/resources/duplication/CrossProjectDuplicationsTest/cross-project-duplications-viewer.html
index 689594fdbb1..689594fdbb1 100644
--- a/it/it-tests/src/test/resources/duplication/CrossProjectDuplicationsTest/cross-project-duplications-viewer.html
+++ b/tests/src/test/resources/duplication/CrossProjectDuplicationsTest/cross-project-duplications-viewer.html
diff --git a/it/it-tests/src/test/resources/duplication/CrossProjectDuplicationsTest/duplications_show-expected.json b/tests/src/test/resources/duplication/CrossProjectDuplicationsTest/duplications_show-expected.json
index a9b0c623f53..a9b0c623f53 100644
--- a/it/it-tests/src/test/resources/duplication/CrossProjectDuplicationsTest/duplications_show-expected.json
+++ b/tests/src/test/resources/duplication/CrossProjectDuplicationsTest/duplications_show-expected.json
diff --git a/it/it-tests/src/test/resources/duplication/CrossProjectDuplicationsTest/sources_lines_duplication-expected.json b/tests/src/test/resources/duplication/CrossProjectDuplicationsTest/sources_lines_duplication-expected.json
index 0ce4c68a243..0ce4c68a243 100644
--- a/it/it-tests/src/test/resources/duplication/CrossProjectDuplicationsTest/sources_lines_duplication-expected.json
+++ b/tests/src/test/resources/duplication/CrossProjectDuplicationsTest/sources_lines_duplication-expected.json
diff --git a/it/it-tests/src/test/resources/duplication/DuplicationsTest/duplications_show-expected.json b/tests/src/test/resources/duplication/DuplicationsTest/duplications_show-expected.json
index 83b69f2be1d..83b69f2be1d 100644
--- a/it/it-tests/src/test/resources/duplication/DuplicationsTest/duplications_show-expected.json
+++ b/tests/src/test/resources/duplication/DuplicationsTest/duplications_show-expected.json
diff --git a/it/it-tests/src/test/resources/duplication/DuplicationsTest/sources_lines_duplication-expected.json b/tests/src/test/resources/duplication/DuplicationsTest/sources_lines_duplication-expected.json
index f6ccc926f29..f6ccc926f29 100644
--- a/it/it-tests/src/test/resources/duplication/DuplicationsTest/sources_lines_duplication-expected.json
+++ b/tests/src/test/resources/duplication/DuplicationsTest/sources_lines_duplication-expected.json
diff --git a/it/it-tests/src/test/resources/duplication/xoo-duplication-profile.xml b/tests/src/test/resources/duplication/xoo-duplication-profile.xml
index 999b64a8251..999b64a8251 100644
--- a/it/it-tests/src/test/resources/duplication/xoo-duplication-profile.xml
+++ b/tests/src/test/resources/duplication/xoo-duplication-profile.xml
diff --git a/it/it-tests/src/test/resources/exclusions/IssueExclusionsTest/with-many-rules.xml b/tests/src/test/resources/exclusions/IssueExclusionsTest/with-many-rules.xml
index f3d0baf0616..f3d0baf0616 100644
--- a/it/it-tests/src/test/resources/exclusions/IssueExclusionsTest/with-many-rules.xml
+++ b/tests/src/test/resources/exclusions/IssueExclusionsTest/with-many-rules.xml
diff --git a/it/it-tests/src/test/resources/i18n/default-locale-is-english.html b/tests/src/test/resources/i18n/default-locale-is-english.html
index 978ceaa382e..978ceaa382e 100644
--- a/it/it-tests/src/test/resources/i18n/default-locale-is-english.html
+++ b/tests/src/test/resources/i18n/default-locale-is-english.html
diff --git a/it/it-tests/src/test/resources/i18n/french-locale.html b/tests/src/test/resources/i18n/french-locale.html
index 389f9e04ec4..389f9e04ec4 100644
--- a/it/it-tests/src/test/resources/i18n/french-locale.html
+++ b/tests/src/test/resources/i18n/french-locale.html
diff --git a/it/it-tests/src/test/resources/i18n/french-pack.html b/tests/src/test/resources/i18n/french-pack.html
index 3f801c9a6ec..3f801c9a6ec 100644
--- a/it/it-tests/src/test/resources/i18n/french-pack.html
+++ b/tests/src/test/resources/i18n/french-pack.html
diff --git a/it/it-tests/src/test/resources/i18n/locale-with-france-country.html b/tests/src/test/resources/i18n/locale-with-france-country.html
index e84051475eb..e84051475eb 100644
--- a/it/it-tests/src/test/resources/i18n/locale-with-france-country.html
+++ b/tests/src/test/resources/i18n/locale-with-france-country.html
diff --git a/it/it-tests/src/test/resources/i18n/locale-with-swiss-country.html b/tests/src/test/resources/i18n/locale-with-swiss-country.html
index be1453e002f..be1453e002f 100644
--- a/it/it-tests/src/test/resources/i18n/locale-with-swiss-country.html
+++ b/tests/src/test/resources/i18n/locale-with-swiss-country.html
diff --git a/it/it-tests/src/test/resources/issue/CommonRulesTest/xoo-common-rules-profile.xml b/tests/src/test/resources/issue/CommonRulesTest/xoo-common-rules-profile.xml
index 9803527b94f..9803527b94f 100644
--- a/it/it-tests/src/test/resources/issue/CommonRulesTest/xoo-common-rules-profile.xml
+++ b/tests/src/test/resources/issue/CommonRulesTest/xoo-common-rules-profile.xml
diff --git a/it/it-tests/src/test/resources/issue/CustomRulesTest/custom.xml b/tests/src/test/resources/issue/CustomRulesTest/custom.xml
index b04d126115d..b04d126115d 100644
--- a/it/it-tests/src/test/resources/issue/CustomRulesTest/custom.xml
+++ b/tests/src/test/resources/issue/CustomRulesTest/custom.xml
diff --git a/it/it-tests/src/test/resources/issue/IssueActionTest/xoo-one-issue-per-line-profile.xml b/tests/src/test/resources/issue/IssueActionTest/xoo-one-issue-per-line-profile.xml
index 608f80cae96..608f80cae96 100644
--- a/it/it-tests/src/test/resources/issue/IssueActionTest/xoo-one-issue-per-line-profile.xml
+++ b/tests/src/test/resources/issue/IssueActionTest/xoo-one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/issue/IssueBulkChangeTest/one-issue-per-line-profile.xml b/tests/src/test/resources/issue/IssueBulkChangeTest/one-issue-per-line-profile.xml
index 365aa896a73..365aa896a73 100644
--- a/it/it-tests/src/test/resources/issue/IssueBulkChangeTest/one-issue-per-line-profile.xml
+++ b/tests/src/test/resources/issue/IssueBulkChangeTest/one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/issue/IssueChangelogTest/one-issue-per-line-profile.xml b/tests/src/test/resources/issue/IssueChangelogTest/one-issue-per-line-profile.xml
index 365aa896a73..365aa896a73 100644
--- a/it/it-tests/src/test/resources/issue/IssueChangelogTest/one-issue-per-line-profile.xml
+++ b/tests/src/test/resources/issue/IssueChangelogTest/one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/issue/IssueCreationDateTest/no-rules.xml b/tests/src/test/resources/issue/IssueCreationDateTest/no-rules.xml
index 62ec52d9d10..62ec52d9d10 100644
--- a/it/it-tests/src/test/resources/issue/IssueCreationDateTest/no-rules.xml
+++ b/tests/src/test/resources/issue/IssueCreationDateTest/no-rules.xml
diff --git a/it/it-tests/src/test/resources/issue/IssueCreationDateTest/one-rule.xml b/tests/src/test/resources/issue/IssueCreationDateTest/one-rule.xml
index c1d7d44f02c..c1d7d44f02c 100644
--- a/it/it-tests/src/test/resources/issue/IssueCreationDateTest/one-rule.xml
+++ b/tests/src/test/resources/issue/IssueCreationDateTest/one-rule.xml
diff --git a/it/it-tests/src/test/resources/issue/IssueCreationTest/override-profile-severity.xml b/tests/src/test/resources/issue/IssueCreationTest/override-profile-severity.xml
index d048760be60..d048760be60 100644
--- a/it/it-tests/src/test/resources/issue/IssueCreationTest/override-profile-severity.xml
+++ b/tests/src/test/resources/issue/IssueCreationTest/override-profile-severity.xml
diff --git a/it/it-tests/src/test/resources/issue/IssueCreationTest/with-custom-message.xml b/tests/src/test/resources/issue/IssueCreationTest/with-custom-message.xml
index 323e50985cd..323e50985cd 100644
--- a/it/it-tests/src/test/resources/issue/IssueCreationTest/with-custom-message.xml
+++ b/tests/src/test/resources/issue/IssueCreationTest/with-custom-message.xml
diff --git a/it/it-tests/src/test/resources/issue/IssueFilterExtensionTest/xoo-with-many-rules.xml b/tests/src/test/resources/issue/IssueFilterExtensionTest/xoo-with-many-rules.xml
index a08c9cdd246..a08c9cdd246 100644
--- a/it/it-tests/src/test/resources/issue/IssueFilterExtensionTest/xoo-with-many-rules.xml
+++ b/tests/src/test/resources/issue/IssueFilterExtensionTest/xoo-with-many-rules.xml
diff --git a/it/it-tests/src/test/resources/issue/IssueFilterOnCommonRulesTest/xoo-common-rules-profile.xml b/tests/src/test/resources/issue/IssueFilterOnCommonRulesTest/xoo-common-rules-profile.xml
index 9803527b94f..9803527b94f 100644
--- a/it/it-tests/src/test/resources/issue/IssueFilterOnCommonRulesTest/xoo-common-rules-profile.xml
+++ b/tests/src/test/resources/issue/IssueFilterOnCommonRulesTest/xoo-common-rules-profile.xml
diff --git a/it/it-tests/src/test/resources/issue/IssueFilterTest/with-many-rules.xml b/tests/src/test/resources/issue/IssueFilterTest/with-many-rules.xml
index 366a3ab7576..366a3ab7576 100644
--- a/it/it-tests/src/test/resources/issue/IssueFilterTest/with-many-rules.xml
+++ b/tests/src/test/resources/issue/IssueFilterTest/with-many-rules.xml
diff --git a/it/it-tests/src/test/resources/issue/IssuePurgeTest/with-many-rules.xml b/tests/src/test/resources/issue/IssuePurgeTest/with-many-rules.xml
index f3d0baf0616..f3d0baf0616 100644
--- a/it/it-tests/src/test/resources/issue/IssuePurgeTest/with-many-rules.xml
+++ b/tests/src/test/resources/issue/IssuePurgeTest/with-many-rules.xml
diff --git a/it/it-tests/src/test/resources/issue/IssueTrackingTest/one-issue-per-module-profile.xml b/tests/src/test/resources/issue/IssueTrackingTest/one-issue-per-module-profile.xml
index 8b863ce9a46..8b863ce9a46 100644
--- a/it/it-tests/src/test/resources/issue/IssueTrackingTest/one-issue-per-module-profile.xml
+++ b/tests/src/test/resources/issue/IssueTrackingTest/one-issue-per-module-profile.xml
diff --git a/it/it-tests/src/test/resources/issue/IssueWorkflowTest/xoo-one-issue-per-line-profile.xml b/tests/src/test/resources/issue/IssueWorkflowTest/xoo-one-issue-per-line-profile.xml
index 608f80cae96..608f80cae96 100644
--- a/it/it-tests/src/test/resources/issue/IssueWorkflowTest/xoo-one-issue-per-line-profile.xml
+++ b/tests/src/test/resources/issue/IssueWorkflowTest/xoo-one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/issue/NewIssuesMeasureTest/profile1.xml b/tests/src/test/resources/issue/NewIssuesMeasureTest/profile1.xml
index 3acc7f6a4ed..3acc7f6a4ed 100644
--- a/it/it-tests/src/test/resources/issue/NewIssuesMeasureTest/profile1.xml
+++ b/tests/src/test/resources/issue/NewIssuesMeasureTest/profile1.xml
diff --git a/it/it-tests/src/test/resources/issue/NewIssuesMeasureTest/profile2.xml b/tests/src/test/resources/issue/NewIssuesMeasureTest/profile2.xml
index 70e0f8cd25a..70e0f8cd25a 100644
--- a/it/it-tests/src/test/resources/issue/NewIssuesMeasureTest/profile2.xml
+++ b/tests/src/test/resources/issue/NewIssuesMeasureTest/profile2.xml
diff --git a/it/it-tests/src/test/resources/issue/issue-on-tag-foobar.xml b/tests/src/test/resources/issue/issue-on-tag-foobar.xml
index d49b8f7c6c5..d49b8f7c6c5 100644
--- a/it/it-tests/src/test/resources/issue/issue-on-tag-foobar.xml
+++ b/tests/src/test/resources/issue/issue-on-tag-foobar.xml
diff --git a/it/it-tests/src/test/resources/issue/one-issue-per-file-profile.xml b/tests/src/test/resources/issue/one-issue-per-file-profile.xml
index 141921f02e7..141921f02e7 100644
--- a/it/it-tests/src/test/resources/issue/one-issue-per-file-profile.xml
+++ b/tests/src/test/resources/issue/one-issue-per-file-profile.xml
diff --git a/it/it-tests/src/test/resources/actionPlan/one-issue-per-line-profile.xml b/tests/src/test/resources/issue/one-issue-per-line-profile.xml
index 28cebcc2380..28cebcc2380 100644
--- a/it/it-tests/src/test/resources/actionPlan/one-issue-per-line-profile.xml
+++ b/tests/src/test/resources/issue/one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/issue/with-many-rules.xml b/tests/src/test/resources/issue/with-many-rules.xml
index f97ef70cefd..f97ef70cefd 100644
--- a/it/it-tests/src/test/resources/issue/with-many-rules.xml
+++ b/tests/src/test/resources/issue/with-many-rules.xml
diff --git a/it/it-tests/src/test/resources/logback-test.xml b/tests/src/test/resources/logback-test.xml
index 599faa969f0..599faa969f0 100644
--- a/it/it-tests/src/test/resources/logback-test.xml
+++ b/tests/src/test/resources/logback-test.xml
diff --git a/it/it-tests/src/test/resources/measure/ProjectDashboardTest/test_project_overview_after_first_analysis.html b/tests/src/test/resources/measure/ProjectDashboardTest/test_project_overview_after_first_analysis.html
index ac440b184aa..ac440b184aa 100644
--- a/it/it-tests/src/test/resources/measure/ProjectDashboardTest/test_project_overview_after_first_analysis.html
+++ b/tests/src/test/resources/measure/ProjectDashboardTest/test_project_overview_after_first_analysis.html
diff --git a/it/it-tests/src/test/resources/measure/ProjectMeasuresPageTest/should_display_measures_page.html b/tests/src/test/resources/measure/ProjectMeasuresPageTest/should_display_measures_page.html
index 4c5a77a9545..4c5a77a9545 100644
--- a/it/it-tests/src/test/resources/measure/ProjectMeasuresPageTest/should_display_measures_page.html
+++ b/tests/src/test/resources/measure/ProjectMeasuresPageTest/should_display_measures_page.html
diff --git a/it/it-tests/src/test/resources/measure/ProjectMeasuresPageTest/should_drilldown_on_list_view.html b/tests/src/test/resources/measure/ProjectMeasuresPageTest/should_drilldown_on_list_view.html
index e68d8b87dfb..e68d8b87dfb 100644
--- a/it/it-tests/src/test/resources/measure/ProjectMeasuresPageTest/should_drilldown_on_list_view.html
+++ b/tests/src/test/resources/measure/ProjectMeasuresPageTest/should_drilldown_on_list_view.html
diff --git a/it/it-tests/src/test/resources/measure/ProjectMeasuresPageTest/should_drilldown_on_tree_view.html b/tests/src/test/resources/measure/ProjectMeasuresPageTest/should_drilldown_on_tree_view.html
index 489c9d93afc..489c9d93afc 100644
--- a/it/it-tests/src/test/resources/measure/ProjectMeasuresPageTest/should_drilldown_on_tree_view.html
+++ b/tests/src/test/resources/measure/ProjectMeasuresPageTest/should_drilldown_on_tree_view.html
diff --git a/it/it-tests/src/test/resources/measure/one-issue-per-file.xml b/tests/src/test/resources/measure/one-issue-per-file.xml
index 7193ebfd779..7193ebfd779 100644
--- a/it/it-tests/src/test/resources/measure/one-issue-per-file.xml
+++ b/tests/src/test/resources/measure/one-issue-per-file.xml
diff --git a/it/it-tests/src/test/resources/measureHistory/one-issue-per-line-profile.xml b/tests/src/test/resources/measure/one-issue-per-line-profile.xml
index 521adc7e06f..521adc7e06f 100644
--- a/it/it-tests/src/test/resources/measureHistory/one-issue-per-line-profile.xml
+++ b/tests/src/test/resources/measure/one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/measure/one-issue-per-line.xml b/tests/src/test/resources/measure/one-issue-per-line.xml
index 365aa896a73..365aa896a73 100644
--- a/it/it-tests/src/test/resources/measure/one-issue-per-line.xml
+++ b/tests/src/test/resources/measure/one-issue-per-line.xml
diff --git a/tests/perf/src/test/resources/one-xoo-issue-per-line.xml b/tests/src/test/resources/one-xoo-issue-per-line.xml
index b2f49460d34..b2f49460d34 100644
--- a/tests/perf/src/test/resources/one-xoo-issue-per-line.xml
+++ b/tests/src/test/resources/one-xoo-issue-per-line.xml
diff --git a/it/it-tests/src/test/resources/organization/IssueAssignTest/one-issue-per-file-profile.xml b/tests/src/test/resources/organization/IssueAssignTest/one-issue-per-file-profile.xml
index 141921f02e7..141921f02e7 100644
--- a/it/it-tests/src/test/resources/organization/IssueAssignTest/one-issue-per-file-profile.xml
+++ b/tests/src/test/resources/organization/IssueAssignTest/one-issue-per-file-profile.xml
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_compare.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_compare.html
index b8ea98d1690..b8ea98d1690 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_compare.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_compare.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_copy.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_copy.html
index 1ed2b8a9018..1ed2b8a9018 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_copy.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_copy.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_create.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_create.html
index a6716b8c06a..a6716b8c06a 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_create.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_create.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_delete.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_delete.html
index 9610b0db66c..9610b0db66c 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_delete.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_delete.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_changelog.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_changelog.html
index 12536be7cbf..12536be7cbf 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_changelog.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_changelog.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_list.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_list.html
index 4d9242c77de..4d9242c77de 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_list.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_list.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_exporters.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_exporters.html
index b26d162f2e7..b26d162f2e7 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_exporters.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_exporters.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_inheritance.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_inheritance.html
index c403fbf5196..c403fbf5196 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_inheritance.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_inheritance.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_projects.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_projects.html
index 062014eb239..062014eb239 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_projects.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_projects.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_rules.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_rules.html
index 6b497fc7b58..6b497fc7b58 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_rules.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_display_profile_rules.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_filter_by_language.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_filter_by_language.html
index a913a70a34f..a913a70a34f 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_filter_by_language.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_filter_by_language.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_open_from_list.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_open_from_list.html
index 2e753ba1cd7..2e753ba1cd7 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_open_from_list.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_open_from_list.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_rename.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_rename.html
index 5da4d40ca0c..5da4d40ca0c 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_rename.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_rename.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_restore.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_restore.html
index dd2d21ba31f..dd2d21ba31f 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_restore.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_restore.html
diff --git a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_set_default.html b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_set_default.html
index c267bf702e3..c267bf702e3 100644
--- a/it/it-tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_set_default.html
+++ b/tests/src/test/resources/organization/OrganizationQualityProfilesUiTest/should_set_default.html
diff --git a/it/it-tests/src/test/resources/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html b/tests/src/test/resources/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html
index e28cdbba827..e28cdbba827 100644
--- a/it/it-tests/src/test/resources/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html
+++ b/tests/src/test/resources/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html
diff --git a/it/it-tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html b/tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html
index b6256e49b35..b6256e49b35 100644
--- a/it/it-tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html
+++ b/tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html
diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html b/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html
index 496917b9e4c..496917b9e4c 100644
--- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html
+++ b/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html
diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html b/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html
index f336f7e93b9..f336f7e93b9 100644
--- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html
+++ b/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html
diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html b/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html
index 9345f6e3f75..9345f6e3f75 100644
--- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html
+++ b/tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html
diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html b/tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html
index cbb6595ff20..cbb6595ff20 100644
--- a/it/it-tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html
+++ b/tests/src/test/resources/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html
diff --git a/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-add-metrics.html b/tests/src/test/resources/projectComparison/ProjectComparisonTest/should-add-metrics.html
index ab7758bd71a..ab7758bd71a 100644
--- a/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-add-metrics.html
+++ b/tests/src/test/resources/projectComparison/ProjectComparisonTest/should-add-metrics.html
diff --git a/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-add-projects.html b/tests/src/test/resources/projectComparison/ProjectComparisonTest/should-add-projects.html
index 18c882331ad..18c882331ad 100644
--- a/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-add-projects.html
+++ b/tests/src/test/resources/projectComparison/ProjectComparisonTest/should-add-projects.html
diff --git a/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-display-basic-set-of-metrics.html b/tests/src/test/resources/projectComparison/ProjectComparisonTest/should-display-basic-set-of-metrics.html
index 3a8e1256198..3a8e1256198 100644
--- a/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-display-basic-set-of-metrics.html
+++ b/tests/src/test/resources/projectComparison/ProjectComparisonTest/should-display-basic-set-of-metrics.html
diff --git a/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-move-and-remove-metrics.html b/tests/src/test/resources/projectComparison/ProjectComparisonTest/should-move-and-remove-metrics.html
index 3b89b4af128..3b89b4af128 100644
--- a/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-move-and-remove-metrics.html
+++ b/tests/src/test/resources/projectComparison/ProjectComparisonTest/should-move-and-remove-metrics.html
diff --git a/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-move-and-remove-projects.html b/tests/src/test/resources/projectComparison/ProjectComparisonTest/should-move-and-remove-projects.html
index f7d71dbfd2f..f7d71dbfd2f 100644
--- a/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-move-and-remove-projects.html
+++ b/tests/src/test/resources/projectComparison/ProjectComparisonTest/should-move-and-remove-projects.html
diff --git a/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-not-add-differential-metrics.html b/tests/src/test/resources/projectComparison/ProjectComparisonTest/should-not-add-differential-metrics.html
index ff433b66005..ff433b66005 100644
--- a/it/it-tests/src/test/resources/projectComparison/ProjectComparisonTest/should-not-add-differential-metrics.html
+++ b/tests/src/test/resources/projectComparison/ProjectComparisonTest/should-not-add-differential-metrics.html
diff --git a/it/it-tests/src/test/resources/projectSearch/SearchProjectsTest/with-many-rules.xml b/tests/src/test/resources/projectSearch/SearchProjectsTest/with-many-rules.xml
index 366a3ab7576..366a3ab7576 100644
--- a/it/it-tests/src/test/resources/projectSearch/SearchProjectsTest/with-many-rules.xml
+++ b/tests/src/test/resources/projectSearch/SearchProjectsTest/with-many-rules.xml
diff --git a/it/it-tests/src/test/resources/qualityGate/QualityGateOnRatingMeasuresTest/with-many-rules.xml b/tests/src/test/resources/qualityGate/QualityGateOnRatingMeasuresTest/with-many-rules.xml
index 6668eff9096..6668eff9096 100644
--- a/it/it-tests/src/test/resources/qualityGate/QualityGateOnRatingMeasuresTest/with-many-rules.xml
+++ b/tests/src/test/resources/qualityGate/QualityGateOnRatingMeasuresTest/with-many-rules.xml
diff --git a/it/it-tests/src/test/resources/qualityGate/QualityGateUiTest/should-display-alerts-correctly-history-page.html b/tests/src/test/resources/qualityGate/QualityGateUiTest/should-display-alerts-correctly-history-page.html
index 951ae58d38a..951ae58d38a 100644
--- a/it/it-tests/src/test/resources/qualityGate/QualityGateUiTest/should-display-alerts-correctly-history-page.html
+++ b/tests/src/test/resources/qualityGate/QualityGateUiTest/should-display-alerts-correctly-history-page.html
diff --git a/it/it-tests/src/test/resources/qualityGate/QualityGateUiTest/should_display_quality_gates_page.html b/tests/src/test/resources/qualityGate/QualityGateUiTest/should_display_quality_gates_page.html
index b0975df675d..b0975df675d 100644
--- a/it/it-tests/src/test/resources/qualityGate/QualityGateUiTest/should_display_quality_gates_page.html
+++ b/tests/src/test/resources/qualityGate/QualityGateUiTest/should_display_quality_gates_page.html
diff --git a/it/it-tests/src/test/resources/qualityGate/notifications/activate_notification_channels.html b/tests/src/test/resources/qualityGate/notifications/activate_notification_channels.html
index 40de82c178a..40de82c178a 100644
--- a/it/it-tests/src/test/resources/qualityGate/notifications/activate_notification_channels.html
+++ b/tests/src/test/resources/qualityGate/notifications/activate_notification_channels.html
diff --git a/it/it-tests/src/test/resources/qualityGate/notifications/email_configuration.html b/tests/src/test/resources/qualityGate/notifications/email_configuration.html
index 7b43cf8ee03..7b43cf8ee03 100644
--- a/it/it-tests/src/test/resources/qualityGate/notifications/email_configuration.html
+++ b/tests/src/test/resources/qualityGate/notifications/email_configuration.html
diff --git a/it/it-tests/src/test/resources/qualityModel/has-hello-tag.xml b/tests/src/test/resources/qualityModel/has-hello-tag.xml
index 88cf4f9273e..88cf4f9273e 100644
--- a/it/it-tests/src/test/resources/qualityModel/has-hello-tag.xml
+++ b/tests/src/test/resources/qualityModel/has-hello-tag.xml
diff --git a/it/it-tests/src/test/resources/qualityModel/one-day-debt-per-file.xml b/tests/src/test/resources/qualityModel/one-day-debt-per-file.xml
index cdebd7554c9..cdebd7554c9 100644
--- a/it/it-tests/src/test/resources/qualityModel/one-day-debt-per-file.xml
+++ b/tests/src/test/resources/qualityModel/one-day-debt-per-file.xml
diff --git a/it/it-tests/src/test/resources/qualityModel/one-issue-per-file.xml b/tests/src/test/resources/qualityModel/one-issue-per-file.xml
index 7193ebfd779..7193ebfd779 100644
--- a/it/it-tests/src/test/resources/qualityModel/one-issue-per-file.xml
+++ b/tests/src/test/resources/qualityModel/one-issue-per-file.xml
diff --git a/it/it-tests/src/test/resources/qualityModel/one-issue-per-line.xml b/tests/src/test/resources/qualityModel/one-issue-per-line.xml
index 521adc7e06f..521adc7e06f 100644
--- a/it/it-tests/src/test/resources/qualityModel/one-issue-per-line.xml
+++ b/tests/src/test/resources/qualityModel/one-issue-per-line.xml
diff --git a/it/it-tests/src/test/resources/qualityModel/with-many-rules.xml b/tests/src/test/resources/qualityModel/with-many-rules.xml
index 6668eff9096..6668eff9096 100644
--- a/it/it-tests/src/test/resources/qualityModel/with-many-rules.xml
+++ b/tests/src/test/resources/qualityModel/with-many-rules.xml
diff --git a/it/it-tests/src/test/resources/qualityModel/without-type-bug.xml b/tests/src/test/resources/qualityModel/without-type-bug.xml
index 89c92cf10fa..89c92cf10fa 100644
--- a/it/it-tests/src/test/resources/qualityModel/without-type-bug.xml
+++ b/tests/src/test/resources/qualityModel/without-type-bug.xml
diff --git a/it/it-tests/src/test/resources/qualityModel/without-type-code-smells.xml b/tests/src/test/resources/qualityModel/without-type-code-smells.xml
index 4bbb6f88ed7..4bbb6f88ed7 100644
--- a/it/it-tests/src/test/resources/qualityModel/without-type-code-smells.xml
+++ b/tests/src/test/resources/qualityModel/without-type-code-smells.xml
diff --git a/it/it-tests/src/test/resources/qualityModel/without-type-vulnerability.xml b/tests/src/test/resources/qualityModel/without-type-vulnerability.xml
index c5fb823bd7c..c5fb823bd7c 100644
--- a/it/it-tests/src/test/resources/qualityModel/without-type-vulnerability.xml
+++ b/tests/src/test/resources/qualityModel/without-type-vulnerability.xml
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_compare.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_compare.html
index c2339d690f6..c2339d690f6 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_compare.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_compare.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_copy.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_copy.html
index d2f0a12a8b3..d2f0a12a8b3 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_copy.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_copy.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_create.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_create.html
index 7fefabfbd4a..7fefabfbd4a 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_create.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_create.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_delete.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_delete.html
index 85e85c0391c..85e85c0391c 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_delete.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_delete.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_changelog.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_changelog.html
index 8614c2fdab9..8614c2fdab9 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_changelog.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_changelog.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_list.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_list.html
index 66f83c9af47..66f83c9af47 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_list.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_list.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_exporters.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_exporters.html
index ea8b1d321f1..ea8b1d321f1 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_exporters.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_exporters.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_inheritance.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_inheritance.html
index 501ae5b5df8..501ae5b5df8 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_inheritance.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_inheritance.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_projects.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_projects.html
index ff38495e318..ff38495e318 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_projects.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_projects.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_rules.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_rules.html
index eb5ccf3194b..eb5ccf3194b 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_rules.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_display_profile_rules.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_filter_by_language.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_filter_by_language.html
index cfe5321b816..cfe5321b816 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_filter_by_language.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_filter_by_language.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_open_from_list.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_open_from_list.html
index de19c00a017..de19c00a017 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_open_from_list.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_open_from_list.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_rename.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_rename.html
index dfa3138f8b1..dfa3138f8b1 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_rename.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_rename.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_restore.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_restore.html
index 8def7727001..8def7727001 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_restore.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_restore.html
diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_set_default.html b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_set_default.html
index 6306820ba6a..6306820ba6a 100644
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_set_default.html
+++ b/tests/src/test/resources/qualityProfile/QualityProfilesUiTest/should_set_default.html
diff --git a/it/it-tests/src/test/resources/serverSystem/HttpsTest/keystore.jks b/tests/src/test/resources/serverSystem/HttpsTest/keystore.jks
index 13234b49dc2..13234b49dc2 100644
--- a/it/it-tests/src/test/resources/serverSystem/HttpsTest/keystore.jks
+++ b/tests/src/test/resources/serverSystem/HttpsTest/keystore.jks
diff --git a/it/it-tests/src/test/resources/serverSystem/HttpsTest/keystore.jks.txt b/tests/src/test/resources/serverSystem/HttpsTest/keystore.jks.txt
index ce4a4adfc39..ce4a4adfc39 100644
--- a/it/it-tests/src/test/resources/serverSystem/HttpsTest/keystore.jks.txt
+++ b/tests/src/test/resources/serverSystem/HttpsTest/keystore.jks.txt
diff --git a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/derby-warning.html b/tests/src/test/resources/serverSystem/ServerSystemTest/derby-warning.html
index c2e13c56aad..c2e13c56aad 100644
--- a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/derby-warning.html
+++ b/tests/src/test/resources/serverSystem/ServerSystemTest/derby-warning.html
diff --git a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/hide-jdbc-settings.html b/tests/src/test/resources/serverSystem/ServerSystemTest/hide-jdbc-settings.html
index 311d000f9cd..311d000f9cd 100644
--- a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/hide-jdbc-settings.html
+++ b/tests/src/test/resources/serverSystem/ServerSystemTest/hide-jdbc-settings.html
diff --git a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/incompatible-plugin-1.0.jar b/tests/src/test/resources/serverSystem/ServerSystemTest/incompatible-plugin-1.0.jar
index 541131c5093..541131c5093 100644
--- a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/incompatible-plugin-1.0.jar
+++ b/tests/src/test/resources/serverSystem/ServerSystemTest/incompatible-plugin-1.0.jar
diff --git a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html b/tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html
index e304586c59c..e304586c59c 100644
--- a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html
+++ b/tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html
diff --git a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/url_ending_by_jsp.html b/tests/src/test/resources/serverSystem/ServerSystemTest/url_ending_by_jsp.html
index 12056550fc2..12056550fc2 100644
--- a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/url_ending_by_jsp.html
+++ b/tests/src/test/resources/serverSystem/ServerSystemTest/url_ending_by_jsp.html
diff --git a/it/it-tests/src/test/resources/settings/SettingsTest/sonar-secret.txt b/tests/src/test/resources/settings/SettingsTest/sonar-secret.txt
index 65b98c522da..65b98c522da 100644
--- a/it/it-tests/src/test/resources/settings/SettingsTest/sonar-secret.txt
+++ b/tests/src/test/resources/settings/SettingsTest/sonar-secret.txt
diff --git a/it/it-tests/src/test/resources/sourceCode/EncodingTest/japanese_sources.html b/tests/src/test/resources/sourceCode/EncodingTest/japanese_sources.html
index d873fba3939..d873fba3939 100644
--- a/it/it-tests/src/test/resources/sourceCode/EncodingTest/japanese_sources.html
+++ b/tests/src/test/resources/sourceCode/EncodingTest/japanese_sources.html
diff --git a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/symbol-usages-highlighting.html b/tests/src/test/resources/sourceCode/HighlightingTest/symbol-usages-highlighting.html
index 42e1fc154f2..42e1fc154f2 100644
--- a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/symbol-usages-highlighting.html
+++ b/tests/src/test/resources/sourceCode/HighlightingTest/symbol-usages-highlighting.html
diff --git a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v1.html b/tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v1.html
index 7a1e36cf816..7a1e36cf816 100644
--- a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v1.html
+++ b/tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v1.html
diff --git a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v2.html b/tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v2.html
index 7f473dd9e43..7f473dd9e43 100644
--- a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v2.html
+++ b/tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting-v2.html
diff --git a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting.html b/tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting.html
index 53e4602a978..53e4602a978 100644
--- a/it/it-tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting.html
+++ b/tests/src/test/resources/sourceCode/HighlightingTest/syntax-highlighting.html
diff --git a/it/it-tests/src/test/resources/sourceCode/ProjectCodeTest/code_page_should_expand_root_dir.html b/tests/src/test/resources/sourceCode/ProjectCodeTest/code_page_should_expand_root_dir.html
index c9737d5fe25..c9737d5fe25 100644
--- a/it/it-tests/src/test/resources/sourceCode/ProjectCodeTest/code_page_should_expand_root_dir.html
+++ b/tests/src/test/resources/sourceCode/ProjectCodeTest/code_page_should_expand_root_dir.html
diff --git a/it/it-tests/src/test/resources/sourceCode/ProjectCodeTest/permalink.html b/tests/src/test/resources/sourceCode/ProjectCodeTest/permalink.html
index 69364a69079..69364a69079 100644
--- a/it/it-tests/src/test/resources/sourceCode/ProjectCodeTest/permalink.html
+++ b/tests/src/test/resources/sourceCode/ProjectCodeTest/permalink.html
diff --git a/it/it-tests/src/test/resources/sourceCode/ProjectCodeTest/search.html b/tests/src/test/resources/sourceCode/ProjectCodeTest/search.html
index 1594ee28cd5..1594ee28cd5 100644
--- a/it/it-tests/src/test/resources/sourceCode/ProjectCodeTest/search.html
+++ b/tests/src/test/resources/sourceCode/ProjectCodeTest/search.html
diff --git a/it/it-tests/src/test/resources/sourceCode/ProjectCodeTest/test_project_code_page.html b/tests/src/test/resources/sourceCode/ProjectCodeTest/test_project_code_page.html
index 9c6b163fa44..9c6b163fa44 100644
--- a/it/it-tests/src/test/resources/sourceCode/ProjectCodeTest/test_project_code_page.html
+++ b/tests/src/test/resources/sourceCode/ProjectCodeTest/test_project_code_page.html
diff --git a/it/it-tests/src/test/resources/test/CoverageTest/it_coverage-expected.json b/tests/src/test/resources/test/CoverageTest/it_coverage-expected.json
index 521b372b6ea..521b372b6ea 100644
--- a/it/it-tests/src/test/resources/test/CoverageTest/it_coverage-expected.json
+++ b/tests/src/test/resources/test/CoverageTest/it_coverage-expected.json
diff --git a/it/it-tests/src/test/resources/test/CoverageTest/unit_test_coverage-expected.json b/tests/src/test/resources/test/CoverageTest/unit_test_coverage-expected.json
index c2f25a610a9..c2f25a610a9 100644
--- a/it/it-tests/src/test/resources/test/CoverageTest/unit_test_coverage-expected.json
+++ b/tests/src/test/resources/test/CoverageTest/unit_test_coverage-expected.json
diff --git a/it/it-tests/src/test/resources/test/CoverageTest/unit_test_coverage_no_condition-expected.json b/tests/src/test/resources/test/CoverageTest/unit_test_coverage_no_condition-expected.json
index aabf73102ff..aabf73102ff 100644
--- a/it/it-tests/src/test/resources/test/CoverageTest/unit_test_coverage_no_condition-expected.json
+++ b/tests/src/test/resources/test/CoverageTest/unit_test_coverage_no_condition-expected.json
diff --git a/it/it-tests/src/test/resources/test/CoverageTest/ut_and_it_coverage-expected.json b/tests/src/test/resources/test/CoverageTest/ut_and_it_coverage-expected.json
index d2b26d19c61..d2b26d19c61 100644
--- a/it/it-tests/src/test/resources/test/CoverageTest/ut_and_it_coverage-expected.json
+++ b/tests/src/test/resources/test/CoverageTest/ut_and_it_coverage-expected.json
diff --git a/it/it-tests/src/test/resources/test/CoverageTrackingTest/covered_files-expected.json b/tests/src/test/resources/test/CoverageTrackingTest/covered_files-expected.json
index 5dda4f3dd11..5dda4f3dd11 100644
--- a/it/it-tests/src/test/resources/test/CoverageTrackingTest/covered_files-expected.json
+++ b/tests/src/test/resources/test/CoverageTrackingTest/covered_files-expected.json
diff --git a/it/it-tests/src/test/resources/test/CoverageTrackingTest/tests-expected.json b/tests/src/test/resources/test/CoverageTrackingTest/tests-expected.json
index 121e6753074..121e6753074 100644
--- a/it/it-tests/src/test/resources/test/CoverageTrackingTest/tests-expected.json
+++ b/tests/src/test/resources/test/CoverageTrackingTest/tests-expected.json
diff --git a/it/it-tests/src/test/resources/test/TestExecutionTest/expected.json b/tests/src/test/resources/test/TestExecutionTest/expected.json
index 843d28f5284..843d28f5284 100644
--- a/it/it-tests/src/test/resources/test/TestExecutionTest/expected.json
+++ b/tests/src/test/resources/test/TestExecutionTest/expected.json
diff --git a/it/it-tests/src/test/resources/uiExtension/UiExtensionsTest/static-files.html b/tests/src/test/resources/ui/UiExtensionsTest/static-files.html
index 0acd31cc1fa..0acd31cc1fa 100644
--- a/it/it-tests/src/test/resources/uiExtension/UiExtensionsTest/static-files.html
+++ b/tests/src/test/resources/ui/UiExtensionsTest/static-files.html
diff --git a/it/it-tests/src/test/resources/updateCenter/UpdateCenterTest/update-center.properties b/tests/src/test/resources/updateCenter/UpdateCenterTest/update-center.properties
index 5882d43188f..5882d43188f 100644
--- a/it/it-tests/src/test/resources/updateCenter/UpdateCenterTest/update-center.properties
+++ b/tests/src/test/resources/updateCenter/UpdateCenterTest/update-center.properties
diff --git a/it/it-tests/src/test/resources/updateCenter/installed-plugins.html b/tests/src/test/resources/updateCenter/installed-plugins.html
index d1986f6f897..d1986f6f897 100644
--- a/it/it-tests/src/test/resources/updateCenter/installed-plugins.html
+++ b/tests/src/test/resources/updateCenter/installed-plugins.html
diff --git a/it/it-tests/src/test/resources/user/BaseIdentityProviderTest/display_message_in_ui_but_not_in_log_when_unauthorized_exception.html b/tests/src/test/resources/user/BaseIdentityProviderTest/display_message_in_ui_but_not_in_log_when_unauthorized_exception.html
index b62763fb7c9..b62763fb7c9 100644
--- a/it/it-tests/src/test/resources/user/BaseIdentityProviderTest/display_message_in_ui_but_not_in_log_when_unauthorized_exception.html
+++ b/tests/src/test/resources/user/BaseIdentityProviderTest/display_message_in_ui_but_not_in_log_when_unauthorized_exception.html
diff --git a/it/it-tests/src/test/resources/user/BaseIdentityProviderTest/display_unauthorized_page_when_authentication_failed.html b/tests/src/test/resources/user/BaseIdentityProviderTest/display_unauthorized_page_when_authentication_failed.html
index 47a19a2df41..47a19a2df41 100644
--- a/it/it-tests/src/test/resources/user/BaseIdentityProviderTest/display_unauthorized_page_when_authentication_failed.html
+++ b/tests/src/test/resources/user/BaseIdentityProviderTest/display_unauthorized_page_when_authentication_failed.html
diff --git a/it/it-tests/src/test/resources/user/BaseIdentityProviderTest/fail_to_authenticate_when_not_allowed_to_sign_up.html b/tests/src/test/resources/user/BaseIdentityProviderTest/fail_to_authenticate_when_not_allowed_to_sign_up.html
index 40c300bd701..40c300bd701 100644
--- a/it/it-tests/src/test/resources/user/BaseIdentityProviderTest/fail_to_authenticate_when_not_allowed_to_sign_up.html
+++ b/tests/src/test/resources/user/BaseIdentityProviderTest/fail_to_authenticate_when_not_allowed_to_sign_up.html
diff --git a/it/it-tests/src/test/resources/user/BaseIdentityProviderTest/fail_when_email_already_exists.html b/tests/src/test/resources/user/BaseIdentityProviderTest/fail_when_email_already_exists.html
index b6f7e600ac3..b6f7e600ac3 100644
--- a/it/it-tests/src/test/resources/user/BaseIdentityProviderTest/fail_when_email_already_exists.html
+++ b/tests/src/test/resources/user/BaseIdentityProviderTest/fail_when_email_already_exists.html
diff --git a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/create-and-delete-user.html b/tests/src/test/resources/user/ExternalAuthenticationTest/create-and-delete-user.html
index f7d0dd6ffb6..f7d0dd6ffb6 100644
--- a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/create-and-delete-user.html
+++ b/tests/src/test/resources/user/ExternalAuthenticationTest/create-and-delete-user.html
diff --git a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details.html b/tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details.html
index b2d712f516c..b2d712f516c 100644
--- a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details.html
+++ b/tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details.html
diff --git a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details2.html b/tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details2.html
index d18ae08afb9..d18ae08afb9 100644
--- a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details2.html
+++ b/tests/src/test/resources/user/ExternalAuthenticationTest/external-user-details2.html
diff --git a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/system-info.html b/tests/src/test/resources/user/ExternalAuthenticationTest/system-info.html
index 1daf46d205d..1daf46d205d 100644
--- a/it/it-tests/src/test/resources/user/ExternalAuthenticationTest/system-info.html
+++ b/tests/src/test/resources/user/ExternalAuthenticationTest/system-info.html
diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/allow_users_to_sign_up.html b/tests/src/test/resources/user/LocalAuthenticationTest/allow_users_to_sign_up.html
index dab0c303ea5..dab0c303ea5 100644
--- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/allow_users_to_sign_up.html
+++ b/tests/src/test/resources/user/LocalAuthenticationTest/allow_users_to_sign_up.html
diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html b/tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html
index 4c5a751665d..4c5a751665d 100644
--- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html
+++ b/tests/src/test/resources/user/LocalAuthenticationTest/force-authentication.html
diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/login_successful.html b/tests/src/test/resources/user/LocalAuthenticationTest/login_successful.html
index 18da805f66b..18da805f66b 100644
--- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/login_successful.html
+++ b/tests/src/test/resources/user/LocalAuthenticationTest/login_successful.html
diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/login_wrong_password.html b/tests/src/test/resources/user/LocalAuthenticationTest/login_wrong_password.html
index dc66db8ee9b..dc66db8ee9b 100644
--- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/login_wrong_password.html
+++ b/tests/src/test/resources/user/LocalAuthenticationTest/login_wrong_password.html
diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_login_when_not_enough_privilege.html b/tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_login_when_not_enough_privilege.html
index 9b5a1645ace..9b5a1645ace 100644
--- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_login_when_not_enough_privilege.html
+++ b/tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_login_when_not_enough_privilege.html
diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_direct_login.html b/tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_direct_login.html
index c6519726f27..c6519726f27 100644
--- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_direct_login.html
+++ b/tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_direct_login.html
diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_indirect_login.html b/tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_indirect_login.html
index aecfd8af765..aecfd8af765 100644
--- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_indirect_login.html
+++ b/tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_after_indirect_login.html
diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_with_parameters_after_direct_login.html b/tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_with_parameters_after_direct_login.html
index 5359e3308e0..5359e3308e0 100644
--- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_with_parameters_after_direct_login.html
+++ b/tests/src/test/resources/user/LocalAuthenticationTest/redirect_to_original_url_with_parameters_after_direct_login.html
diff --git a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/should_not_be_unlogged_when_going_to_login_page.html b/tests/src/test/resources/user/LocalAuthenticationTest/should_not_be_unlogged_when_going_to_login_page.html
index af5b4362f0e..af5b4362f0e 100644
--- a/it/it-tests/src/test/resources/user/LocalAuthenticationTest/should_not_be_unlogged_when_going_to_login_page.html
+++ b/tests/src/test/resources/user/LocalAuthenticationTest/should_not_be_unlogged_when_going_to_login_page.html
diff --git a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_no_projects.html b/tests/src/test/resources/user/MyAccountPageTest/should_display_no_projects.html
index 2c2f0f026db..2c2f0f026db 100644
--- a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_no_projects.html
+++ b/tests/src/test/resources/user/MyAccountPageTest/should_display_no_projects.html
diff --git a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_projects.html b/tests/src/test/resources/user/MyAccountPageTest/should_display_projects.html
index b199152803f..b199152803f 100644
--- a/it/it-tests/src/test/resources/user/MyAccountPageTest/should_display_projects.html
+++ b/tests/src/test/resources/user/MyAccountPageTest/should_display_projects.html
diff --git a/it/it-tests/src/test/resources/user/OAuth2IdentityProviderTest/display_message_in_ui_but_not_in_log_when_unauthorized_exception.html b/tests/src/test/resources/user/OAuth2IdentityProviderTest/display_message_in_ui_but_not_in_log_when_unauthorized_exception.html
index 6a38ed69063..6a38ed69063 100644
--- a/it/it-tests/src/test/resources/user/OAuth2IdentityProviderTest/display_message_in_ui_but_not_in_log_when_unauthorized_exception.html
+++ b/tests/src/test/resources/user/OAuth2IdentityProviderTest/display_message_in_ui_but_not_in_log_when_unauthorized_exception.html
diff --git a/it/it-tests/src/test/resources/user/OAuth2IdentityProviderTest/display_unauthorized_page_when_authentication_failed.html b/tests/src/test/resources/user/OAuth2IdentityProviderTest/display_unauthorized_page_when_authentication_failed.html
index b01d24aad4c..b01d24aad4c 100644
--- a/it/it-tests/src/test/resources/user/OAuth2IdentityProviderTest/display_unauthorized_page_when_authentication_failed.html
+++ b/tests/src/test/resources/user/OAuth2IdentityProviderTest/display_unauthorized_page_when_authentication_failed.html
diff --git a/it/it-tests/src/test/resources/user/OAuth2IdentityProviderTest/fail_to_authenticate_when_not_allowed_to_sign_up.html b/tests/src/test/resources/user/OAuth2IdentityProviderTest/fail_to_authenticate_when_not_allowed_to_sign_up.html
index a3da2de8ed0..a3da2de8ed0 100644
--- a/it/it-tests/src/test/resources/user/OAuth2IdentityProviderTest/fail_to_authenticate_when_not_allowed_to_sign_up.html
+++ b/tests/src/test/resources/user/OAuth2IdentityProviderTest/fail_to_authenticate_when_not_allowed_to_sign_up.html
diff --git a/it/it-tests/src/test/resources/user/OAuth2IdentityProviderTest/fail_when_email_already_exists.html b/tests/src/test/resources/user/OAuth2IdentityProviderTest/fail_when_email_already_exists.html
index 7d038ac592d..7d038ac592d 100644
--- a/it/it-tests/src/test/resources/user/OAuth2IdentityProviderTest/fail_when_email_already_exists.html
+++ b/tests/src/test/resources/user/OAuth2IdentityProviderTest/fail_when_email_already_exists.html
diff --git a/it/it-tests/src/test/resources/administration/UsersPageTest/admin_should_change_its_own_password.html b/tests/src/test/resources/user/UsersPageTest/admin_should_change_its_own_password.html
index 06e806cf259..06e806cf259 100644
--- a/it/it-tests/src/test/resources/administration/UsersPageTest/admin_should_change_its_own_password.html
+++ b/tests/src/test/resources/user/UsersPageTest/admin_should_change_its_own_password.html
diff --git a/it/it-tests/src/test/resources/administration/UsersPageTest/generate_and_revoke_user_token.html b/tests/src/test/resources/user/UsersPageTest/generate_and_revoke_user_token.html
index c81949c4d10..c81949c4d10 100644
--- a/it/it-tests/src/test/resources/administration/UsersPageTest/generate_and_revoke_user_token.html
+++ b/tests/src/test/resources/user/UsersPageTest/generate_and_revoke_user_token.html
diff --git a/tests/upgrade/pom.xml b/tests/upgrade/pom.xml
deleted file mode 100644
index 78076b21a59..00000000000
--- a/tests/upgrade/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>tests</artifactId>
-    <version>6.5-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>upgrade</artifactId>
-  <name>SonarQube :: Upgrade Tests</name>
-
-  <properties>
-    <sqZipDir>../../sonar-application/target</sqZipDir>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.sonarsource.sonarqube</groupId>
-      <artifactId>sonar-ws</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-ws</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>sonar-application</artifactId>
-      <version>${project.version}</version>
-      <type>zip</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.sonarsource.orchestrator</groupId>
-      <artifactId>sonar-orchestrator</artifactId>
-      <version>${orchestrator.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.sonar</groupId>
-      <artifactId>sonar-update-center-common</artifactId>
-      <version>1.12.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <!-- required for selenide -->
-      <version>21.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.codeborne</groupId>
-      <artifactId>selenide</artifactId>
-      <version>4.4.3</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <argLine>-Dsonar.runtimeVersion=${project.version} -Dmaven.localRepository=${settings.localRepository}</argLine>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>with-db-drivers</id>
-      <activation>
-        <property>
-          <name>with-db-drivers</name>
-        </property>
-      </activation>
-      <dependencies>
-        <dependency>
-          <groupId>com.microsoft.sqlserver</groupId>
-          <artifactId>mssql-jdbc</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>mysql</groupId>
-          <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.postgresql</groupId>
-          <artifactId>postgresql</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>com.oracle</groupId>
-          <artifactId>ojdbc6</artifactId>
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-
-</project>
diff --git a/tests/upgrade/src/test/resources/sonar-way-5.1.xml b/tests/upgrade/src/test/resources/sonar-way-5.1.xml
deleted file mode 100644
index 6ea7577c626..00000000000
--- a/tests/upgrade/src/test/resources/sonar-way-5.1.xml
+++ /dev/null
@@ -1,1111 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<profile>
-  <name>sonar-way-5.1</name>
-  <language>java</language>
-  <rules>
-    <rule>
-      <repositoryKey>common-java</repositoryKey>
-      <key>DuplicatedBlocks</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>common-java</repositoryKey>
-      <key>InsufficientBranchCoverage</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>minimumBranchCoverageRatio</key>
-          <value>65.0</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00105</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>MethodCyclomaticComplexity</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>max</key>
-          <value>10</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ClassCyclomaticComplexity</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>max</key>
-          <value>200</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>CommentedOutCodeLine</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00108</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00107</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>maximumMethodParameters</key>
-          <value>7</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00112</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00100</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[a-z][a-zA-Z0-9]*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00101</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[A-Z][a-zA-Z0-9]*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00114</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[A-Z][a-zA-Z0-9]*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00115</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00116</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[a-z][a-zA-Z0-9]*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00117</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[a-z][a-zA-Z0-9]*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00119</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[A-Z]$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00120</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>^[a-z]+(\.[a-z][a-z0-9]*)*$</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S00122</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>RightCurlyBraceStartLineCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>UselessParenthesesCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ObjectFinalizeCheck</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ObjectFinalizeOverridenCheck</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ObjectFinalizeOverridenCallsSuperFinalizeCheck</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ClassVariableVisibilityCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ForLoopCounterChangedCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>LabelsShouldNotBeUsedCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>SwitchLastCaseIsDefaultCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>EmptyStatementUsageCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>ModifiersOrderCheck</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>AssignmentInSubExpressionCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>UselessImportCheck</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>LowerCaseLongSuffixCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>MissingDeprecatedCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>HiddenFieldCheck</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1133</key>
-      <priority>INFO</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1134</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1135</key>
-      <priority>INFO</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1118</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1132</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1126</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1125</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1067</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>max</key>
-          <value>3</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1141</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1147</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1143</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1145</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1157</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1155</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1149</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1171</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1168</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1170</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1163</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S106</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1165</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1066</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S134</key>
-      <priority>MINOR</priority>
-      <parameters>
-        <parameter>
-          <key>max</key>
-          <value>3</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1181</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1150</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1182</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1151</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>max</key>
-          <value>5</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S128</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1166</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>exceptions</key>
-          <value>java.lang.InterruptedException, java.lang.NumberFormatException, java.text.ParseException,
-            java.net.MalformedURLException
-          </value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1190</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1188</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>max</key>
-          <value>20</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1191</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S135</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1186</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1185</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1174</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1175</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1153</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1148</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1195</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1194</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1193</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1192</key>
-      <priority>MINOR</priority>
-      <parameters>
-        <parameter>
-          <key>threshold</key>
-          <value>3</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1158</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1215</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1197</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1220</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1221</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1199</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1214</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1201</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1210</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1206</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1219</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1301</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1314</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1226</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1313</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1312</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>format</key>
-          <value>LOG(?:GER)?</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1318</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1223</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1319</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1213</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1444</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1452</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1481</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1068</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1317</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1596</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>UnusedPrivateMethod</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>RedundantThrowsDeclarationCheck</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1160</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1217</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1862</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1488</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1602</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1611</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1700</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1172</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1294</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1598</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1873</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1948</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1479</key>
-      <priority>MAJOR</priority>
-      <parameters>
-        <parameter>
-          <key>maximum</key>
-          <value>30</value>
-        </parameter>
-      </parameters>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1764</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1244</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2077</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1161</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1994</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2094</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1850</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1905</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2114</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1065</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2184</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2225</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2230</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2200</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2092</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1848</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2235</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S888</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2068</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2232</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1849</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2236</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1844</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2251</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2252</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2254</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2226</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2250</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2111</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2109</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2273</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2276</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2274</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2272</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2277</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2204</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2178</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2116</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2157</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2275</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2151</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2127</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S1860</key>
-      <priority>BLOCKER</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2055</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2118</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2066</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2065</key>
-      <priority>MINOR</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2061</key>
-      <priority>CRITICAL</priority>
-      <parameters/>
-    </rule>
-    <rule>
-      <repositoryKey>squid</repositoryKey>
-      <key>S2176</key>
-      <priority>MAJOR</priority>
-      <parameters/>
-    </rule>
-  </rules>
-</profile>