diff --git a/validator-core/src/test/java/fr/ign/validator/io/ModelReaderFactoryTest.java b/validator-core/src/test/java/fr/ign/validator/io/ModelReaderFactoryTest.java
index 88cb6a2d..43cb00c7 100644
--- a/validator-core/src/test/java/fr/ign/validator/io/ModelReaderFactoryTest.java
+++ b/validator-core/src/test/java/fr/ign/validator/io/ModelReaderFactoryTest.java
@@ -1,5 +1,7 @@
 package fr.ign.validator.io;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.net.MalformedURLException;
@@ -7,13 +9,22 @@
 
 import org.junit.Test;
 
+import fr.ign.validator.exception.InvalidModelException;
+
 public class ModelReaderFactoryTest {
 
     @Test
     public void testXml() throws MalformedURLException {
         URL url = new URL("https://example.org/my-model.xml");
-        ModelReader reader = ModelReaderFactory.createModelReader(url);
-        assertTrue(reader instanceof XmlModelReader);
+        RuntimeException thrown = null;
+        try {
+            ModelReaderFactory.createModelReader(url);
+        }catch(RuntimeException e){
+            thrown = e;
+        }
+        assertNotNull(thrown);
+        assertTrue(thrown instanceof InvalidModelException);
+        assertEquals("Fail to load https://example.org/my-model.xml (XML model support has been removed, use JSON format)",thrown.getMessage());
     }
 
     @Test
diff --git a/validator-core/src/test/java/fr/ign/validator/io/XmlModelReaderTest.java b/validator-core/src/test/java/fr/ign/validator/io/XmlModelReaderTest.java
deleted file mode 100644
index e50928a8..00000000
--- a/validator-core/src/test/java/fr/ign/validator/io/XmlModelReaderTest.java
+++ /dev/null
@@ -1,320 +0,0 @@
-package fr.ign.validator.io;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.util.Strings;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-import fr.ign.validator.exception.ModelNotFoundException;
-import fr.ign.validator.model.AttributeConstraints;
-import fr.ign.validator.model.AttributeType;
-import fr.ign.validator.model.DocumentModel;
-import fr.ign.validator.model.FeatureType;
-import fr.ign.validator.model.FileModel;
-import fr.ign.validator.model.FileModel.MandatoryMode;
-import fr.ign.validator.model.TableModel;
-import fr.ign.validator.model.file.SingleTableModel;
-import fr.ign.validator.tools.ResourceHelper;
-
-public class XmlModelReaderTest {
-
-    private ModelReader modelLoader;
-
-    @Before
-    public void setUp() throws Exception {
-        modelLoader = new XmlModelReader();
-    }
-
-    /**
-     * Ensure that ModelNotFoundException are thrown if DocumentModel file doesn't
-     * exists
-     */
-    @Test
-    public void testLoadDocumentModelFileNotFound() {
-        File configDir = ResourceHelper.getResourceFile(getClass(), "/config-xml");
-        File documentModelPath = new File(configDir, "/not-found/files.xml");
-        boolean thrown = false;
-        try {
-            modelLoader.loadDocumentModel(documentModelPath);
-        } catch (ModelNotFoundException e) {
-            Assert.assertTrue(e.getMessage().contains("/not-found/files.xml"));
-            thrown = true;
-        }
-        Assert.assertTrue("ModelNotFoundException excepted", thrown);
-    }
-
-    /**
-     * Ensure that ModelNotFoundException are thrown if DocumentModel URL doesn't
-     * exists
-     *
-     * @throws MalformedURLException
-     */
-    @Test
-    public void testLoadDocumentModelUrlNotFound() throws MalformedURLException {
-        URL documentModelUrl = new URL("https://example.local/not-found/files.xml");
-        boolean thrown = false;
-        try {
-            modelLoader.loadDocumentModel(documentModelUrl);
-        } catch (ModelNotFoundException e) {
-            Assert.assertEquals("Model 'https://example.local/not-found/files.xml' not found", e.getMessage());
-            thrown = true;
-        }
-        Assert.assertTrue("ModelNotFoundException excepted", thrown);
-    }
-
-    /**
-     * Ensure that ModelNotFoundException are thrown if a FeatureType is missing
-     *
-     * @throws MalformedURLException
-     */
-    @Test
-    public void testLoadDocumentModelFeatureTypeNotFound() throws MalformedURLException {
-        File documentModelPath = ResourceHelper.getResourceFile(
-            getClass(), "/config-xml/missing_feature_type/files.xml"
-        );
-        boolean thrown = false;
-        try {
-            modelLoader.loadDocumentModel(documentModelPath);
-        } catch (ModelNotFoundException e) {
-            Assert.assertTrue(e.getMessage().contains("/missing_feature_type/types/MY_TABLE.xml' not found"));
-            thrown = true;
-        }
-        Assert.assertTrue("ModelNotFoundException excepted", thrown);
-    }
-
-    /**
-     * Read cnig_PLU_2014 and performs regress test
-     *
-     * @throws JsonProcessingException
-     */
-    @Test
-    public void testLoadDocumentModelCnigPlu2014() {
-        File documentModelPath = ResourceHelper.getResourceFile(getClass(), "/config-xml/cnig_PLU_2014/files.xml");
-        DocumentModel documentModel = modelLoader.loadDocumentModel(documentModelPath);
-        assertIsValid(documentModel);
-
-        Assert.assertEquals("cnig_PLU_2014", documentModel.getName());
-        Assert.assertEquals(31, documentModel.getFileModels().size());
-    }
-
-    /**
-     * Read adresse model and performs regress test
-     *
-     * @throws JsonProcessingException
-     */
-    @Test
-    public void testLoadDocumentModelAdresse() {
-        File documentModelPath = ResourceHelper.getResourceFile(getClass(), "/config-xml/adresse/files.xml");
-        DocumentModel documentModel = modelLoader.loadDocumentModel(documentModelPath);
-        assertIsValid(documentModel);
-
-        Assert.assertEquals("adresse", documentModel.getName());
-        Assert.assertEquals(1, documentModel.getFileModels().size());
-
-        FileModel fileModel = documentModel.getFileModels().get(0);
-        Assert.assertEquals("ADRESSE", fileModel.getName());
-
-        Assert.assertTrue(fileModel instanceof SingleTableModel);
-        FeatureType featureType = ((TableModel) fileModel).getFeatureType();
-        Assert.assertNotNull(featureType);
-        Assert.assertEquals(2, featureType.getAttributeCount());
-
-        int index = 0;
-        {
-            AttributeType<?> attribute = featureType.getAttribute(index++);
-            Assert.assertEquals("ID", attribute.getName());
-            Assert.assertEquals("String", attribute.getTypeName());
-            Assert.assertTrue(attribute.getConstraints().isUnique());
-        }
-        {
-            AttributeType<?> attribute = featureType.getAttribute(index++);
-            Assert.assertEquals("ADRESSE", attribute.getName());
-            Assert.assertEquals("String", attribute.getTypeName());
-            Assert.assertFalse(attribute.getConstraints().isUnique());
-        }
-    }
-
-    /**
-     * Load DocumentModel /config-xml/sample-document/files.xml and performs checks
-     */
-    @Test
-    public void testLoadDocumentModelSampleDocument() {
-        File documentModelPath = ResourceHelper.getResourceFile(getClass(), "/config-xml/sample-document/files.xml");
-        DocumentModel documentModel = modelLoader.loadDocumentModel(documentModelPath);
-        assertIsValid(documentModel);
-
-        // name
-        Assert.assertEquals("ccccc_CC_dddddddd", documentModel.getName());
-        // DocumentContraints
-        Assert.assertEquals(
-            "[0-9]{5}_CC_[0-9]{8}",
-            documentModel.getConstraints().getFolderName()
-        );
-        Assert.assertNull(
-            documentModel.getConstraints().getMetadataSpecification()
-        );
-
-        // fileModels
-        Assert.assertEquals(3, documentModel.getFileModels().size());
-        int index = 0;
-        {
-            FileModel fileModel = documentModel.getFileModels().get(index++);
-            Assert.assertEquals("SIMPLE", fileModel.getName());
-            Assert.assertTrue(fileModel instanceof SingleTableModel);
-            FeatureType featureType = ((TableModel) fileModel).getFeatureType();
-            Assert.assertNotNull(featureType);
-            Assert.assertEquals(MandatoryMode.WARN, fileModel.getMandatory());
-            Assert.assertEquals("SIMPLE", featureType.getName());
-        }
-        {
-            FileModel fileModel = documentModel.getFileModels().get(index++);
-            Assert.assertEquals("Donnees_geographiques", fileModel.getName());
-            Assert.assertEquals(MandatoryMode.ERROR, fileModel.getMandatory());
-        }
-        {
-            FileModel fileModel = documentModel.getFileModels().get(index++);
-            Assert.assertEquals("COMMUNE", fileModel.getName());
-            Assert.assertEquals(MandatoryMode.WARN, fileModel.getMandatory());
-
-            Assert.assertTrue(fileModel instanceof SingleTableModel);
-            FeatureType featureType = ((TableModel) fileModel).getFeatureType();
-            Assert.assertNotNull(featureType);
-            Assert.assertEquals("COMMUNE", featureType.getName());
-            assertExceptedFeatureTypeCommune(featureType);
-        }
-    }
-
-    /**
-     * Check FeatureType definition for
-     * /config-xml/sample-document/types/COMMUNE.xml
-     *
-     * @param featureType
-     */
-    private void assertExceptedFeatureTypeCommune(FeatureType featureType) {
-        int index = 0;
-        {
-            AttributeType<?> attributeType = featureType.getAttribute(index++);
-            Assert.assertEquals("INSEE", attributeType.getName());
-            Assert.assertEquals("String", attributeType.getTypeName());
-            AttributeConstraints contraints = attributeType.getConstraints();
-            Assert.assertEquals(true, contraints.isRequired());
-            Assert.assertEquals(true, contraints.isUnique());
-            Assert.assertEquals("[0-9]{5}", contraints.getPattern());
-            Assert.assertNull(contraints.getReference());
-            Assert.assertNull(contraints.getEnumValues());
-        }
-        {
-            AttributeType<?> attributeType = featureType.getAttribute(index++);
-            Assert.assertEquals("CODE_DEPT", attributeType.getName());
-            Assert.assertEquals("String", attributeType.getTypeName());
-            AttributeConstraints constraints = attributeType.getConstraints();
-            Assert.assertEquals(true, constraints.isRequired());
-            Assert.assertNull(constraints.getPattern());
-            Assert.assertEquals(false, constraints.isUnique());
-            Assert.assertNull(constraints.getReference());
-            Assert.assertNotNull(constraints.getEnumValues());
-            Assert.assertEquals("01,02", Strings.join(constraints.getEnumValues(), ','));
-        }
-        {
-            AttributeType<?> attributeType = featureType.getAttribute(index++);
-            Assert.assertEquals("DETRUIT", attributeType.getName());
-            Assert.assertEquals("Boolean", attributeType.getTypeName());
-            AttributeConstraints constraints = attributeType.getConstraints();
-            Assert.assertEquals(false, constraints.isRequired());
-            Assert.assertNull(constraints.getPattern());
-            Assert.assertEquals(false, constraints.isUnique());
-            Assert.assertNull(constraints.getReference());
-            Assert.assertNull(constraints.getEnumValues());
-        }
-    }
-
-    @Test
-    public void testLoadFeatureTypeWithCDATA() {
-        File srcFile = ResourceHelper.getResourceFile(getClass(), "/config-xml/sample-document/types/SIMPLE.xml");
-
-        FeatureType featureType = modelLoader.loadFeatureType(srcFile);
-        Assert.assertEquals("SIMPLE", featureType.getName());
-        Assert.assertEquals("TABLE TEST", featureType.getDescription());
-        Assert.assertEquals(3, featureType.getAttributeCount());
-        Assert.assertTrue(featureType.isSpatial());
-
-        int index = 0;
-        {
-            AttributeType<?> attribute = featureType.getAttribute(index++);
-            Assert.assertEquals("ID", attribute.getName());
-            Assert.assertEquals("Integer", attribute.getTypeName());
-
-            AttributeConstraints constraints = attribute.getConstraints();
-            Assert.assertTrue(constraints.isRequired());
-            Assert.assertFalse(constraints.isUnique());
-            Assert.assertNull(constraints.getPattern());
-            Assert.assertNull(constraints.getEnumValues());
-        }
-
-        {
-            AttributeType<?> attribute = featureType.getAttribute(index++);
-            Assert.assertEquals("NAME", attribute.getName());
-            Assert.assertEquals("String", attribute.getTypeName());
-
-            AttributeConstraints constraints = attribute.getConstraints();
-            Assert.assertTrue(constraints.isRequired());
-            Assert.assertFalse(constraints.isUnique());
-            Assert.assertNull(constraints.getPattern());
-            Assert.assertNull(constraints.getEnumValues());
-        }
-
-        {
-            AttributeType<?> attribute = featureType.getAttribute(index++);
-            Assert.assertEquals("GEOMETRY", attribute.getName());
-            Assert.assertEquals("Geometry", attribute.getTypeName());
-
-            AttributeConstraints constraints = attribute.getConstraints();
-            Assert.assertFalse(constraints.isRequired());
-            Assert.assertFalse(constraints.isUnique());
-            Assert.assertNull(constraints.getPattern());
-            Assert.assertNull(constraints.getEnumValues());
-        }
-
-    }
-
-    /**
-     * Performs basic consistency checks on DocumentModel
-     *
-     * @param documentModel
-     */
-    private void assertIsValid(DocumentModel documentModel) {
-        List<FileModel> fileModels = documentModel.getFileModels();
-        for (FileModel fileModel : fileModels) {
-            Assert.assertNotNull(fileModel.getName());
-            Assert.assertNotNull(fileModel.getMandatory());
-            if (fileModel instanceof SingleTableModel) {
-                FeatureType featureType = ((TableModel) fileModel).getFeatureType();
-                Assert.assertNotNull(featureType);
-                assertIsValid(featureType);
-            }
-        }
-    }
-
-    /**
-     * Performs basic consistency checks on FeatureType
-     *
-     * @param documentModel
-     */
-    private void assertIsValid(FeatureType featureType) {
-        Assert.assertFalse(StringUtils.isEmpty(featureType.getName()));
-
-        Assert.assertFalse(
-            "featureType must have at least one attribute",
-            featureType.getAttributeCount() == 0
-        );
-    }
-
-}
diff --git a/validator-core/src/test/java/fr/ign/validator/normalize/TableNormalizerTest.java b/validator-core/src/test/java/fr/ign/validator/normalize/TableNormalizerTest.java
index 65cecc85..2c60ce87 100644
--- a/validator-core/src/test/java/fr/ign/validator/normalize/TableNormalizerTest.java
+++ b/validator-core/src/test/java/fr/ign/validator/normalize/TableNormalizerTest.java
@@ -12,8 +12,8 @@
 
 import fr.ign.validator.Context;
 import fr.ign.validator.data.Document;
+import fr.ign.validator.io.JsonModelReader;
 import fr.ign.validator.io.ModelReader;
-import fr.ign.validator.io.XmlModelReader;
 import fr.ign.validator.model.DocumentModel;
 import fr.ign.validator.model.FeatureType;
 import fr.ign.validator.model.FileModel;
@@ -42,8 +42,8 @@ public void setUp() throws Exception {
         context.setProjection(Projection.CODE_CRS84);
         context.setReportBuilder(reportBuilder);
 
-        File documentModelPath = ResourceHelper.getResourceFile(getClass(), "/config-xml/adresse/files.xml");
-        ModelReader modelLoader = new XmlModelReader();
+        File documentModelPath = ResourceHelper.getResourceFile(getClass(), "/config-json/adresse/files.json");
+        ModelReader modelLoader = new JsonModelReader();
         DocumentModel documentModel = modelLoader.loadDocumentModel(documentModelPath);
 
         File documentPath = ResourceHelper.getResourceFile(getClass(), "/documents/adresse-multiple");
diff --git a/validator-core/src/test/java/fr/ign/validator/tools/FileUtilsTest.java b/validator-core/src/test/java/fr/ign/validator/tools/FileUtilsTest.java
index 776578bc..6242adc0 100644
--- a/validator-core/src/test/java/fr/ign/validator/tools/FileUtilsTest.java
+++ b/validator-core/src/test/java/fr/ign/validator/tools/FileUtilsTest.java
@@ -11,12 +11,13 @@ public class FileUtilsTest {
 
     @Test
     public void testListFilesAndDirs() {
-        File directory = ResourceHelper.getResourceFile(getClass(), "/config-xml/geofla");
+        File directory = ResourceHelper.getResourceFile(getClass(), "/documents/commune-sample");
         String[] extensions = {
             "xml"
         };
         Collection<File> files = FileUtils.listFilesAndDirs(directory, extensions);
-        assertEquals(4, files.size());
+        // 2 XML files and 1 sub-directory
+        assertEquals(3, files.size());
     }
 
 }
diff --git a/validator-core/src/test/java/fr/ign/validator/validation/attribute/CharactersValidatorTest.java b/validator-core/src/test/java/fr/ign/validator/validation/attribute/CharactersValidatorTest.java
index 9dbf22d0..9835c0c9 100644
--- a/validator-core/src/test/java/fr/ign/validator/validation/attribute/CharactersValidatorTest.java
+++ b/validator-core/src/test/java/fr/ign/validator/validation/attribute/CharactersValidatorTest.java
@@ -28,7 +28,7 @@ public void setUp() throws Exception {
 
         context = new Context();
         context.setStringFixer(StringFixer.createFullStringFixer(StandardCharsets.ISO_8859_1));
-        File currentDirectory = ResourceHelper.getResourceFile(getClass(), "/config-xml/geofla");
+        File currentDirectory = ResourceHelper.getResourceFile(getClass(), "/documents/adresse-multiple");
         context.setCurrentDirectory(currentDirectory);
 
         report = new InMemoryReportBuilder();
diff --git a/validator-core/src/test/java/fr/ign/validator/validation/attribute/FilenameExistsValidatorTest.java b/validator-core/src/test/java/fr/ign/validator/validation/attribute/FilenameExistsValidatorTest.java
index 18c689d1..7c784932 100644
--- a/validator-core/src/test/java/fr/ign/validator/validation/attribute/FilenameExistsValidatorTest.java
+++ b/validator-core/src/test/java/fr/ign/validator/validation/attribute/FilenameExistsValidatorTest.java
@@ -23,7 +23,7 @@ public void setUp() throws Exception {
         validator = new FilenameExistsValidator();
 
         context = new Context();
-        File currentDirectory = ResourceHelper.getResourceFile(getClass(), "/config-xml/geofla");
+        File currentDirectory = ResourceHelper.getResourceFile(getClass(), "/documents/commune-sample");
         context.setCurrentDirectory(currentDirectory);
 
         report = new InMemoryReportBuilder();
@@ -33,7 +33,7 @@ public void setUp() throws Exception {
     @Test
     public void testExisting() {
         PathType type = new PathType();
-        Attribute<File> attribute = new Attribute<File>(type, new File("files.xml"));
+        Attribute<File> attribute = new Attribute<File>(type, new File("commune.csv"));
         validator.validate(context, attribute);
         Assert.assertEquals(0, report.countErrors());
     }
@@ -41,7 +41,7 @@ public void testExisting() {
     @Test
     public void testExistingWithFragment() {
         PathType type = new PathType();
-        Attribute<File> attribute = new Attribute<File>(type, new File("files.xml#page=15"));
+        Attribute<File> attribute = new Attribute<File>(type, new File("commune.csv#page=15"));
         validator.validate(context, attribute);
         Assert.assertEquals(0, report.countErrors());
     }
@@ -49,7 +49,7 @@ public void testExistingWithFragment() {
     @Test
     public void testExistingInSubdirectory() {
         PathType type = new PathType();
-        Attribute<File> attribute = new Attribute<File>(type, new File("COMMUNE.xml"));
+        Attribute<File> attribute = new Attribute<File>(type, new File("a_file.pdf"));
         validator.validate(context, attribute);
         Assert.assertEquals(0, report.countErrors());
     }
@@ -57,7 +57,7 @@ public void testExistingInSubdirectory() {
     @Test
     public void testExistingInSubdirectoryWithFragment() {
         PathType type = new PathType();
-        Attribute<File> attribute = new Attribute<File>(type, new File("COMMUNE.xml#page=15"));
+        Attribute<File> attribute = new Attribute<File>(type, new File("a_file.pdf#page=15"));
         validator.validate(context, attribute);
         Assert.assertEquals(0, report.countErrors());
     }
diff --git a/validator-core/src/test/java/fr/ign/validator/validation/document/DocumentFolderNameValidatorTest.java b/validator-core/src/test/java/fr/ign/validator/validation/document/DocumentFolderNameValidatorTest.java
index 761a75b7..d7027739 100644
--- a/validator-core/src/test/java/fr/ign/validator/validation/document/DocumentFolderNameValidatorTest.java
+++ b/validator-core/src/test/java/fr/ign/validator/validation/document/DocumentFolderNameValidatorTest.java
@@ -23,7 +23,7 @@ public void setUp() throws Exception {
         validator = new DocumentFolderNameValidator();
 
         context = new Context();
-        File currentDirectory = ResourceHelper.getResourceFile(getClass(), "/config-xml/geofla");
+        File currentDirectory = ResourceHelper.getResourceFile(getClass(), "/documents/commune-sample");
         context.setCurrentDirectory(currentDirectory);
 
         report = new InMemoryReportBuilder();
diff --git a/validator-core/src/test/resources/config-xml/adresse/files.xml b/validator-core/src/test/resources/config-xml/adresse/files.xml
deleted file mode 100644
index 6c07922a..00000000
--- a/validator-core/src/test/resources/config-xml/adresse/files.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <id><![CDATA[]]></id>
-  <name><![CDATA[adresse]]></name>
-  <description><![CDATA[Sample configuration for adresse files)]]></description>
-  <regexp><![CDATA[+[a-Z]]]></regexp>
-  <files>
-    <file>
-      <id><![CDATA[]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[ADRESSE]]></name>
-      <path><![CDATA[ADRESSE(_+[0-9])?]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-  </files>
-</document>
diff --git a/validator-core/src/test/resources/config-xml/adresse/types/ADRESSE.xml b/validator-core/src/test/resources/config-xml/adresse/types/ADRESSE.xml
deleted file mode 100644
index 868f5c9c..00000000
--- a/validator-core/src/test/resources/config-xml/adresse/types/ADRESSE.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-	<typeName><![CDATA[ADRESSE]]></typeName>
-	<description><![CDATA[Table d'identifiant et adresse]]></description>
-	<attributes>
-		<attribute>
-			<id><![CDATA[64ab3e72aff3e5ddb155e943c9093cf2]]></id>
-			<name><![CDATA[ID]]></name>
-			<description><![CDATA[Identifiant unique]]></description>
-			<type><![CDATA[String]]></type>
-			<size>20</size>
-			<nullable>false</nullable>
-			<identifier>true</identifier>
-		</attribute>
-		<attribute>
-			<id><![CDATA[8e44a0bf8a2c4320e2274d9d565d154f]]></id>
-			<name><![CDATA[ADRESSE]]></name>
-			<description><![CDATA[Une adresse dans une ville]]></description>
-			<type><![CDATA[String]]></type>
-			<size>254</size>
-			<nullable>true</nullable>
-		</attribute>
-	</attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/files.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/files.xml
deleted file mode 100644
index 45805287..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/files.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <id><![CDATA[a92b92f73d59917d050de93dbb4e74c7]]></id>
-  <name><![CDATA[cnig_PLU_2014]]></name>
-  <description><![CDATA[cnig_PLU_2014]]></description>
-  <regexp><![CDATA[(2A|2B|[0-9]{2})[0-9]{3}_PLU_[0-9]{8}]]></regexp>
-  <files>
-    <file>
-      <id><![CDATA[03d497e82f490fe134cc661a3d0cabd1]]></id>
-      <type><![CDATA[metadata]]></type>
-      <name><![CDATA[METADONNEES]]></name>
-      <path><![CDATA[[^\\ ]*]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[81c765b004c69cfb88ea12e00ca42c63]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[DOC_URBA]]></name>
-      <path><![CDATA[DOC_URBA(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[bf55ae40cde2ff97c755bb4775da4374]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[DOC_URBA_COM]]></name>
-      <path><![CDATA[DOC_URBA_COM(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[1d61619430c0936912912668fb2aeb6a]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[Donnees_geographiques]]></name>
-      <path><![CDATA[Donnees_geographiques]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[57ae9bfeb037364c8e0de9eaf8b4431e]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[HABILLAGE_LIN]]></name>
-      <path><![CDATA[Donnees_geographiques/HABILLAGE_LIN(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[72da484d6634db30124a42d5cfb8fadb]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[HABILLAGE_PCT]]></name>
-      <path><![CDATA[Donnees_geographiques/HABILLAGE_PCT(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[8e4388991dea2e969aac2b5b5fa74055]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[HABILLAGE_SURF]]></name>
-      <path><![CDATA[Donnees_geographiques/HABILLAGE_SURF(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[e786f3afc60b4234bcf79c82f27939e6]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[HABILLAGE_TXT]]></name>
-      <path><![CDATA[Donnees_geographiques/HABILLAGE_TXT(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[9998c533ee7e24adfd15bff4d9bd4adb]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[INFO_LIN]]></name>
-      <path><![CDATA[Donnees_geographiques/INFO_LIN(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[e6a84a9d821a8f73f4a174fd2ba874f4]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[INFO_PCT]]></name>
-      <path><![CDATA[Donnees_geographiques/INFO_PCT(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[357e29ca1bda8c52887373e0be176887]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[INFO_SURF]]></name>
-      <path><![CDATA[Donnees_geographiques/INFO_SURF(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[b1891ccf8c04f127064dbd8971d0ec63]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[PRESCRIPTION_LIN]]></name>
-      <path><![CDATA[Donnees_geographiques/PRESCRIPTION_LIN(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[eeee6c9903a753f2c8c6e9707b684707]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[PRESCRIPTION_PCT]]></name>
-      <path><![CDATA[Donnees_geographiques/PRESCRIPTION_PCT(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[406748dfd7b28451647c6860dcfde056]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[PRESCRIPTION_SURF]]></name>
-      <path><![CDATA[Donnees_geographiques/PRESCRIPTION_SURF(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[766a513304de1a426a715048477f21b2]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[ZONE_URBA]]></name>
-      <path><![CDATA[Donnees_geographiques/ZONE_URBA(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[be6e359007473cbf458e53a6cd9ba911]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[Pieces_ecrites]]></name>
-      <path><![CDATA[Pieces_ecrites]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[0200a0ccc8b4f3ed52584db44366228f]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[0_Procedure]]></name>
-      <path><![CDATA[Pieces_ecrites/0_Procedure]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[d8c95096656b298ceb37138953f77d4a]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[PROCEDURE]]></name>
-      <path><![CDATA[Pieces_ecrites/0_Procedure/(2A|2B|[0-9]{2})[0-9]{3}_procedure_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[779fe97b71f9883dc7d97deb9b791eb2]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[1_Rapport_de_presentation]]></name>
-      <path><![CDATA[Pieces_ecrites/1_Rapport_de_presentation]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[94df13cff06bd6b15cb35bb0d564110a]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[EVALUATION_ENVIRONNEMENTALE]]></name>
-      <description><![CDATA[L'évaluation environnementale]]></description>
-      <path><![CDATA[Pieces_ecrites/1_Rapport_de_presentation/(2A|2B|[0-9]{2})[0-9]{3}_eval_environnement_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[844305554f8fbdcf589c3d68d8547015]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[RAPPORT]]></name>
-      <path><![CDATA[Pieces_ecrites/1_Rapport_de_presentation/(2A|2B|[0-9]{2})[0-9]{3}_rapport_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[ae66764446341c996a2cd35c67189927]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[2_PADD]]></name>
-      <path><![CDATA[Pieces_ecrites/2_PADD]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[4708bf1184e40ee7aa7b6d4f529331f0]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[PADD]]></name>
-      <path><![CDATA[Pieces_ecrites/2_PADD/(2A|2B|[0-9]{2})[0-9]{3}_(PADD|padd)_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[5cd1a84b342bce3bd66f3b99be1fe39e]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[3_Reglement]]></name>
-      <path><![CDATA[Pieces_ecrites/3_Reglement]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[a4ca0afdc13b260779c2e1f70aea4699]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[PRESCRIPTION]]></name>
-      <path><![CDATA[Pieces_ecrites/3_Reglement/(2A|2B|[0-9]{2})[0-9]{3}_prescription_(lin|pct|surf)(_[0-9]*)?_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[e78b5301e71be1f3a1accc9113a8558a]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[REGLEMENT]]></name>
-      <path><![CDATA[Pieces_ecrites/3_Reglement/(2A|2B|[0-9]{2})[0-9]{3}_reglement_[0-9]{8}]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[d4ed9e8634b669769bb6edc110efdddf]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[REGLEMENT_GRAPHIQUE]]></name>
-      <description><![CDATA[Le règlement graphique]]></description>
-      <path><![CDATA[Pieces_ecrites/3_Reglement/(2A|2B|[0-9]{2})[0-9]{3}_reglement_graphique_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[3d901b7e4c8a8f1b9ff4857003b694a2]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[4_Annexes]]></name>
-      <path><![CDATA[Pieces_ecrites/4_Annexes]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[b5acf1244eab8fb52691154859bd781d]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[ANNEXE]]></name>
-      <path><![CDATA[Pieces_ecrites/4_Annexes/[^\\ ]*]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[c01316f9ad0126a396980e4844330464]]></id>
-      <type><![CDATA[directory]]></type>
-      <name><![CDATA[5_Orientations_amenagement]]></name>
-      <path><![CDATA[Pieces_ecrites/5_Orientations_amenagement]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-    <file>
-      <id><![CDATA[22afe8bc815eebdb665cef0b1f0be8aa]]></id>
-      <type><![CDATA[pdf]]></type>
-      <name><![CDATA[ORIENTATIONS_AMENAGEMENT]]></name>
-      <path><![CDATA[Pieces_ecrites/5_Orientations_amenagement/(2A|2B|[0-9]{2})[0-9]{3}_orientations_amenagement(_[0-9]*)?_[0-9]{8}]]></path>
-      <mandatory><![CDATA[OPTIONAL]]></mandatory>
-    </file>
-  </files>
-</document>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/DOC_URBA.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/DOC_URBA.xml
deleted file mode 100644
index f631f6c9..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/DOC_URBA.xml
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[205eca1b2044a921dbac103d5fcf0d08]]></id>
-  <typeName><![CDATA[DOC_URBA]]></typeName>
-  <description><![CDATA[Table contenant la liste des documents d'Urbanisme PLU ou POS dont la numérisation ou l'élaboration sous fourme numérique est engagée]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[00f76d2c413ce610f800bb6f4983b5e2]]></id>
-      <name><![CDATA[TYPEDOC]]></name>
-      <description><![CDATA[Type du document]]></description>
-      <type><![CDATA[String]]></type>
-      <size>4</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[PLU]]></value>
-        <value><![CDATA[POS]]></value>
-        <value><![CDATA[CC]]></value>
-        <value><![CDATA[PSMV]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[0d7b0df2bf4cdd729564cb51088f850d]]></id>
-      <name><![CDATA[URLREG]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier du règlement papier complet scanné]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[1fade0ff7214518c077ac4ff0dfecc43]]></id>
-      <name><![CDATA[ETAT]]></name>
-      <description><![CDATA[Etat juridique du document d'urbanisme]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[06]]></value>
-        <value><![CDATA[07]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[30a3e2766365644aa32dcecc56c8586e]]></id>
-      <name><![CDATA[INTERCO]]></name>
-      <description><![CDATA[Indique si le document d'urbanisme est intercommunal]]></description>
-      <type><![CDATA[String]]></type>
-      <size>1</size>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[T]]></value>
-        <value><![CDATA[F]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[36712f364f03614076085c3a8ab024ef]]></id>
-      <name><![CDATA[NOMREG]]></name>
-      <description><![CDATA[Nom du fichier contentant le document complet du règlement]]></description>
-      <type><![CDATA[String]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[3f1c13456a973dbee0d4c9ca0e8cce3b]]></id>
-      <name><![CDATA[TYPEREF]]></name>
-      <description><![CDATA[Nom du référentiel cadastral utilisé pour la numérisation]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>true</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[02]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[45e9546221d3c62031155c07ac079194]]></id>
-      <name><![CDATA[NOMPLAN]]></name>
-      <description><![CDATA[Nom du fichier contenant le plan origine scanné. Il s'agit du plan sur lequel figure le tampon juridique]]></description>
-      <type><![CDATA[String]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[64ab3e72aff3e5ddb155e943c9093cf2]]></id>
-      <name><![CDATA[IDURBA]]></name>
-      <description><![CDATA[Identifiant unique du PLU]]></description>
-      <type><![CDATA[String]]></type>
-      <size>20</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[88b8ffe6394fd3938a99454a21540b90]]></id>
-      <name><![CDATA[SITEWEB]]></name>
-      <description><![CDATA[Page web du service de consultation du PLU offert par la collectivité locale]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[8e44a0bf8a2c4320e2274d9d565d154f]]></id>
-      <name><![CDATA[URLPLAN]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier du plan scanné]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[8f92993c402b6847086f59aa93d5afff]]></id>
-      <name><![CDATA[DATEFIN]]></name>
-      <description><![CDATA[Date de fin de validité du document d'urbanisme]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c83461113e9140b61084141ccad953aa]]></id>
-      <name><![CDATA[DATEREF]]></name>
-      <description><![CDATA[Date d'actualité ou de mise à jour du référentiel cadastral utilisé pour la création ou la numérisation des documents graphiques.]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ca28fcf3fdda6c32b67846d74bd1fd80]]></id>
-      <name><![CDATA[SIREN]]></name>
-      <description><![CDATA[Indique le numéro SIREN de l'intercommunalité ayant approuvé le PLU. Clé externe permettant de faire le lien avec la table des EPCI]]></description>
-      <type><![CDATA[String]]></type>
-      <size>9</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ddfaee1317a16639be4fdd0315ae74ae]]></id>
-      <name><![CDATA[DATAPPRO]]></name>
-      <description><![CDATA[Date de la dernière approbation administrative du document d'urbanisme]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/DOC_URBA_COM.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/DOC_URBA_COM.xml
deleted file mode 100644
index 38d35cbf..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/DOC_URBA_COM.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[377c0c2802a542790275629eae444052]]></id>
-  <typeName><![CDATA[DOC_URBA_COM]]></typeName>
-  <description><![CDATA[Table contenant la liste des documents d'Urbanisme PLU ou POS dont la numérisation ou l'élaboration sous fourme numérique est engagée]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[40aa1f9bf1d55cbbf63780a7db6a819c]]></id>
-      <name><![CDATA[IDURBA]]></name>
-      <description><![CDATA[Identifiant unique du document d'urbanisme]]></description>
-      <type><![CDATA[String]]></type>
-      <size>20</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[cb7ba3f93bd94eefc031b3759cf5c85c]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par le document d'urbanisme]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_LIN.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_LIN.xml
deleted file mode 100644
index 15f1751a..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_LIN.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[f161d27ac49c01923def5f6118a68750]]></id>
-  <typeName><![CDATA[HABILLAGE_LIN]]></typeName>
-  <description><![CDATA[Table des tracés linéaires indicatifs figurant sur le plan du document d'urbanisme à des fins d'ha]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[341787f3300a17b0b8c6acb1406db369]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'élément d'habillage]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[7fe3e5ff38c98598a44223387cee307e]]></id>
-      <name><![CDATA[NATTRAC]]></name>
-      <description><![CDATA[Nature de la ligne]]></description>
-      <type><![CDATA[String]]></type>
-      <size>40</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ee37b807932e3bd6f87b116cfb7c0118]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiLineString]]></type>
-      <size>-1</size>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_PCT.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_PCT.xml
deleted file mode 100644
index 83b00a8b..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_PCT.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[63e18a45fa7db0a5571066f0a01994d1]]></id>
-  <typeName><![CDATA[HABILLAGE_PCT]]></typeName>
-  <description><![CDATA[Table des tracés ponctuels indicatifs figurant sur le plan du document d'urbanisme à des fins d'ha]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[39c1e66f2b461c1d62d473aac982abc5]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'élément d'habillage]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[aa23e6cba32b49be704108f87595325d]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ad53cd403c9a45b65dd563b2f2413cae]]></id>
-      <name><![CDATA[NATTRAC]]></name>
-      <description><![CDATA[Nature du point]]></description>
-      <type><![CDATA[String]]></type>
-      <size>40</size>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_SURF.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_SURF.xml
deleted file mode 100644
index b3466121..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_SURF.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[df03a746402d7a7bee9b89cccc7fab47]]></id>
-  <typeName><![CDATA[HABILLAGE_SURF]]></typeName>
-  <description><![CDATA[Table des tracés surfaciques indicatifs figurant sur le plan du document d'urbanisme à des fins d'ha]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[3b7e3c46398c3dfdb2962cfd00a97565]]></id>
-      <name><![CDATA[NATTRAC]]></name>
-      <description><![CDATA[Nature du polygon]]></description>
-      <type><![CDATA[String]]></type>
-      <size>40</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[471cf91b1e4483e53c5300a7b2c420a2]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[a9d56307a55bc97c5ecb0321bdd4f17f]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'élément d'habillage]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_TXT.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_TXT.xml
deleted file mode 100644
index 868d4796..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/HABILLAGE_TXT.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[6fcb857100febcfd31d8d43ebacd1c77]]></id>
-  <typeName><![CDATA[HABILLAGE_TXT]]></typeName>
-  <description><![CDATA[Table des objets textuels (étiquettes) figurant sur le plan du document d'urbanisme à des fins d'ha]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[0a7132d4ee719b5bbff4fe943d8a64ee]]></id>
-      <name><![CDATA[POLICE]]></name>
-      <type><![CDATA[String]]></type>
-      <size>40</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[27bf3bc9a34650a451488324abfec206]]></id>
-      <name><![CDATA[STYLE]]></name>
-      <description><![CDATA[Style d'écriture]]></description>
-      <type><![CDATA[String]]></type>
-      <size>40</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[4f8440f89909120f8313300713b10637]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'élément d'habillage]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[5a0dcb52fd2c7411479a8ba9a3011a55]]></id>
-      <name><![CDATA[TAILLE]]></name>
-      <description><![CDATA[Taille des caractères]]></description>
-      <type><![CDATA[Integer]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[862c091043a268256550a16714b39ca3]]></id>
-      <name><![CDATA[ANGLE]]></name>
-      <description><![CDATA[Angle de l'écriture exprimé en degré, par rapport à l'horizontale, dans le sens trigonométrique]]></description>
-      <type><![CDATA[Integer]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[98fbe6c33b931f9dc6d800659897593b]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[9dc08fdd2f73d445257597e7993f6f5b]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Libellé de l'étiquette attachée au point d'habillage]]></description>
-      <type><![CDATA[String]]></type>
-      <size>80</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c4268e2d3f473886eadc413f2da7e07d]]></id>
-      <name><![CDATA[NATECR]]></name>
-      <description><![CDATA[Nature de l'écriture]]></description>
-      <type><![CDATA[String]]></type>
-      <size>40</size>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_LIN.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_LIN.xml
deleted file mode 100644
index 9ba31603..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_LIN.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[33e6b6a82643433e039a853d5c6222c2]]></id>
-  <typeName><![CDATA[INFO_LIN]]></typeName>
-  <description><![CDATA[Table contenant les informations linéaires à reporter à titre d'information]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[001f293efacd8ec4c7c92d1f2d8c5317]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[46130ba4a3bbf72f9ed8e2f212f103c4]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Nom court de l'information servant à faire une étiquette]]></description>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[7e65d773af1dce1b5379a2a157cf5295]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Nom complet de l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[bb40d844d39f9d82f8b2225b61a3895a]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c22904a140649471e9ed359be676a804]]></id>
-      <name><![CDATA[TYPEINF]]></name>
-      <description><![CDATA[Type d'information linéaire dans une liste prédéfinie]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[08]]></value>
-        <value><![CDATA[14]]></value>
-        <value><![CDATA[19]]></value>
-        <value><![CDATA[27]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c2878f08163dd9833e86d440d34b4249]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiLineString]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[cb63ebb6ee2a017f692511cf1f078031]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier contenant le texte décrivant l'information reportée]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_PCT.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_PCT.xml
deleted file mode 100644
index 50b6a028..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_PCT.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[d9e315c3de1de6f99683235d3ebc144a]]></id>
-  <typeName><![CDATA[INFO_PCT]]></typeName>
-  <description><![CDATA[Table contenant les informations ponctuelle à reporter à titre d'information]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[2f3146a9f28a85044005b6876bb372d4]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier contenant le texte décrivant l'information reportée]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[35b4011c916012f85fa4b116e1ae8cd1]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[6471b663e6b10205b4859596e1a01842]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[9423fc2ca70a794061a148ee43f10193]]></id>
-      <name><![CDATA[TYPEINF]]></name>
-      <description><![CDATA[Type d'information ponctuelle dans une liste prédéfinie]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[16]]></value>
-        <value><![CDATA[19]]></value>
-        <value><![CDATA[27]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[d689ae2f6c4549f59377f9837f19009c]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Nom complet de l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ddbbad48547a3328d4cb769b16cc0c8f]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Nom court de l'information servant à faire une étiquette]]></description>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[de4c2bf4b0e71abf278086afc2f37866]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_SURF.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_SURF.xml
deleted file mode 100644
index 724a8bd8..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/INFO_SURF.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[518cd494c508f95fd2ccb3b6973ac0b8]]></id>
-  <typeName><![CDATA[INFO_SURF]]></typeName>
-  <description><![CDATA[INFO_SURF]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[6265b0019c821c9061e4d2adaf9855ce]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[83191b94625f3a08fef098883d4af232]]></id>
-      <name><![CDATA[TYPEINF]]></name>
-      <description><![CDATA[Type de périmètre dans une liste prédéfinie]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[06]]></value>
-        <value><![CDATA[07]]></value>
-        <value><![CDATA[08]]></value>
-        <value><![CDATA[09]]></value>
-        <value><![CDATA[10]]></value>
-        <value><![CDATA[11]]></value>
-        <value><![CDATA[12]]></value>
-        <value><![CDATA[13]]></value>
-        <value><![CDATA[14]]></value>
-        <value><![CDATA[15]]></value>
-        <value><![CDATA[16]]></value>
-        <value><![CDATA[17]]></value>
-        <value><![CDATA[18]]></value>
-        <value><![CDATA[19]]></value>
-        <value><![CDATA[20]]></value>
-        <value><![CDATA[21]]></value>
-        <value><![CDATA[22]]></value>
-        <value><![CDATA[23]]></value>
-        <value><![CDATA[24]]></value>
-        <value><![CDATA[25]]></value>
-        <value><![CDATA[26]]></value>
-        <value><![CDATA[27]]></value>
-        <value><![CDATA[28]]></value>
-        <value><![CDATA[29]]></value>
-        <value><![CDATA[30]]></value>
-        <value><![CDATA[31]]></value>
-        <value><![CDATA[32]]></value>
-        <value><![CDATA[33]]></value>
-        <value><![CDATA[34]]></value>
-        <value><![CDATA[35]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[8cc5f0b5fae22b8a5455d9e5b579467a]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Nom court du périmètre servant à faire une étiquette]]></description>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b1588275b93688a773769b0057d5ebe3]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c37295a84cd77c37311111335350bd0b]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Nom complet du périmètre]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c4dd8b1956eb4c7fcb0991a4dc23f46e]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier contenant le texte décrivant l'information reportée]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[fec12f355f58f3a2b2224e166506a935]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de l'information]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_LIN.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_LIN.xml
deleted file mode 100644
index a53aadc7..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_LIN.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[df13ab0b8c53b0fd818a9641f1d8d51e]]></id>
-  <typeName><![CDATA[PRESCRIPTION_LIN]]></typeName>
-  <description><![CDATA[Table contenant les prescriptions linéaires se superposant au document d'urbanisme et le lien avec le texte qui la décrit]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[3790d4033a3b94bb9ebb2e1375d82970]]></id>
-      <name><![CDATA[DATVALID]]></name>
-      <description><![CDATA[Date de la dernière validation de la prescription]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[58ab30e0cd729ecc56f039852564b92f]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiLineString]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[5c2366ea4a3db81a21d3a551269f0485]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Nom court de la prescription servant à faire une étiquette]]></description>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[7a61c865d25fc65ec7c42f1372212da8]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Intitulé complet de la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b01794c449c755c0e00d78291ec538c1]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[c3ca7a37846e4d1e8c8d28336d102a10]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[ce15fbf5de358a793b1a0576edd92f41]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier PDF décrivant la prescription]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[d513212d56dd313c67dfed47c7f606fd]]></id>
-      <name><![CDATA[TYPEPSC]]></name>
-      <description><![CDATA[Type de la prescription dans une liste prédéfinie]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[07]]></value>
-        <value><![CDATA[11]]></value>
-        <value><![CDATA[15]]></value>
-        <value><![CDATA[18]]></value>
-        <value><![CDATA[21]]></value>
-        <value><![CDATA[22]]></value>
-        <value><![CDATA[24]]></value>
-        <value><![CDATA[25]]></value>
-        <value><![CDATA[28]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[e77aaad29de92a25fff1d83494ee309d]]></id>
-      <name><![CDATA[DATAPPRO]]></name>
-      <description><![CDATA[Date de la dernière approbation de la prescription]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_PCT.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_PCT.xml
deleted file mode 100644
index b0206859..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_PCT.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[d9447969363073652955af4fc7c1f7ea]]></id>
-  <typeName><![CDATA[PRESCRIPTION_PCT]]></typeName>
-  <description><![CDATA[Table contenant les prescriptions ponctuelles se superposant au document d'urbanisme et le lien avec le texte qui la décrit]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[10bc86ddbd845b55da93c4614f194cfc]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPoint]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[54fbf5a3e4962ea52b5b9cfb0fc31edd]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier PDF décrivant la prescription]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[688a2b26c9812fc15fca3bc2c23a27bc]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Intitulé complet de la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[68af4a37dbca7a70309c33390f97dbce]]></id>
-      <name><![CDATA[TYPEPSC]]></name>
-      <description><![CDATA[Type de la prescription dans une liste prédéfinie]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[07]]></value>
-        <value><![CDATA[16]]></value>
-        <value><![CDATA[18]]></value>
-        <value><![CDATA[22]]></value>
-        <value><![CDATA[25]]></value>
-        <value><![CDATA[28]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[6fe5a45d37caa669fc38934c137094e0]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[781057cab7870a1664eba1327e78b803]]></id>
-      <name><![CDATA[DATVALID]]></name>
-      <description><![CDATA[Date de la dernière validation de la prescription]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[85a68a878a5cb30dbb3fbd4e7017dfa1]]></id>
-      <name><![CDATA[DATAPPRO]]></name>
-      <description><![CDATA[Date de la dernière approbation de la prescription]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[af1efeb32bda9816f9b4f1dda3032d5e]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b4c8c9512ef5c99cbebca54dcd206030]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Nom court de la prescription servant à faire une étiquette]]></description>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_SURF.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_SURF.xml
deleted file mode 100644
index c1e1c495..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/PRESCRIPTION_SURF.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[1df44911a69fd617250dda6e75f3f5ff]]></id>
-  <typeName><![CDATA[PRESCRIPTION_SURF]]></typeName>
-  <description><![CDATA[Table contenant les prescriptions surfaciques se superposant au document d'urbanisme et le lien avec le texte qui la décrit]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[133430b5c5eb48a7052662bcc86eb054]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[15af7a7b61ce458c1ca857a839d4d592]]></id>
-      <name><![CDATA[DATAPPRO]]></name>
-      <description><![CDATA[Date de la dernière approbation de la prescription]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[175001591209bb41e8f0e31b73d45655]]></id>
-      <name><![CDATA[DATVALID]]></name>
-      <description><![CDATA[Date de la dernière validation de la prescription]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[50c9bac37692efac7793f8e9eeb5214a]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier PDF décrivant la prescription]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[788c2edeb9bf6018ca62d80793efafa5]]></id>
-      <name><![CDATA[TYPEPSC]]></name>
-      <description><![CDATA[Type de la prescription dans une liste prédéfinie]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[06]]></value>
-        <value><![CDATA[07]]></value>
-        <value><![CDATA[08]]></value>
-        <value><![CDATA[09]]></value>
-        <value><![CDATA[10]]></value>
-        <value><![CDATA[11]]></value>
-        <value><![CDATA[12]]></value>
-        <value><![CDATA[13]]></value>
-        <value><![CDATA[14]]></value>
-        <value><![CDATA[15]]></value>
-        <value><![CDATA[16]]></value>
-        <value><![CDATA[17]]></value>
-        <value><![CDATA[18]]></value>
-        <value><![CDATA[19]]></value>
-        <value><![CDATA[20]]></value>
-        <value><![CDATA[21]]></value>
-        <value><![CDATA[22]]></value>
-        <value><![CDATA[23]]></value>
-        <value><![CDATA[24]]></value>
-        <value><![CDATA[25]]></value>
-        <value><![CDATA[26]]></value>
-        <value><![CDATA[27]]></value>
-        <value><![CDATA[28]]></value>
-        <value><![CDATA[29]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[7b910d70d56b296c8fad55039e65e539]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Intitulé complet de la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[90657d31230e3344e3651a11ccbd4c3b]]></id>
-      <name><![CDATA[TXT]]></name>
-      <description><![CDATA[Nom court de la prescription servant à faire une étiquette]]></description>
-      <type><![CDATA[String]]></type>
-      <size>10</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[a42e9b4fc6a019049cbca20735b77822]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[aa6b5c23c7ba2bc8f611d49d6016f30d]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune concernée par la prescription]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/ZONE_URBA.xml b/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/ZONE_URBA.xml
deleted file mode 100644
index ce9ed74d..00000000
--- a/validator-core/src/test/resources/config-xml/cnig_PLU_2014/types/ZONE_URBA.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id><![CDATA[353f879824ced4083ff0726b606e3b5b]]></id>
-  <typeName><![CDATA[ZONE_URBA]]></typeName>
-  <description><![CDATA[Table contenant les zones d'un document PLU ou POS]]></description>
-  <attributes>
-    <attribute>
-      <id><![CDATA[48c561dd3880fb1ee722528bd5e9a96a]]></id>
-      <name><![CDATA[DESTDOMI]]></name>
-      <description><![CDATA[Vocation dominante de la zone, concerne l’usage de la zone]]></description>
-      <type><![CDATA[String]]></type>
-      <size>2</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[00]]></value>
-        <value><![CDATA[01]]></value>
-        <value><![CDATA[02]]></value>
-        <value><![CDATA[03]]></value>
-        <value><![CDATA[04]]></value>
-        <value><![CDATA[05]]></value>
-        <value><![CDATA[07]]></value>
-        <value><![CDATA[08]]></value>
-        <value><![CDATA[09]]></value>
-        <value><![CDATA[10]]></value>
-        <value><![CDATA[99]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[4ea2f72750bdb441eb3ba537302673b8]]></id>
-      <name><![CDATA[INSEE]]></name>
-      <description><![CDATA[Code INSEE de la commune couverte par la zone]]></description>
-      <type><![CDATA[String]]></type>
-      <size>5</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[778abd5f2cc00db7e71c87b4067f443e]]></id>
-      <name><![CDATA[URLFIC]]></name>
-      <description><![CDATA[URL ou URI qui pointe sur le fichier de règlement de la zone ou à défaut du règlement intégral indexé]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[83d6f8154193665a2d1a1745173cee04]]></id>
-      <name><![CDATA[NOMFIC]]></name>
-      <description><![CDATA[Nom du fichier du règlement de la zone]]></description>
-      <type><![CDATA[Filename]]></type>
-      <size>80</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[8b3566b1dc53dfe2920966bb62981663]]></id>
-      <name><![CDATA[LIBELONG]]></name>
-      <description><![CDATA[Nom complet littéral de la zone tel qu’il apparaît dans le chapitre du règlement écrit]]></description>
-      <type><![CDATA[String]]></type>
-      <size>254</size>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[a737537117f70442737583f560eddf09]]></id>
-      <name><![CDATA[TYPEZONE]]></name>
-      <description><![CDATA[Type de la zone dans une nomenclature simplifiée]]></description>
-      <type><![CDATA[String]]></type>
-      <size>3</size>
-      <nullable>false</nullable>
-      <listOfValues>
-        <value><![CDATA[U]]></value>
-        <value><![CDATA[AUc]]></value>
-        <value><![CDATA[AUs]]></value>
-        <value><![CDATA[A]]></value>
-        <value><![CDATA[N]]></value>
-        <value><![CDATA[Nh]]></value>
-        <value><![CDATA[Nd]]></value>
-        <value><![CDATA[Ah]]></value>
-      </listOfValues>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b0e4bc2b4d3f3c1da7e8e9d850b71fd6]]></id>
-      <name><![CDATA[DATAPPRO]]></name>
-      <description><![CDATA[Date de la dernière approbation de la zone]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[b295ea213d1c74dadac7511da195651b]]></id>
-      <name><![CDATA[DATVALID]]></name>
-      <description><![CDATA[Date de la dernière validation de la zone ou de son règlement]]></description>
-      <type><![CDATA[Date]]></type>
-      <nullable>true</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[e91ea5c358d4262af96fd5bc0fda3cda]]></id>
-      <name><![CDATA[LIBELLE]]></name>
-      <description><![CDATA[Nom court de la zone tel qu’il apparaît sur le plan de zonage]]></description>
-      <type><![CDATA[String]]></type>
-      <size>12</size>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id><![CDATA[f96a702bafbe4132ff9a8431fb3571bb]]></id>
-      <name><![CDATA[WKT]]></name>
-      <description><![CDATA[Geométrie associée]]></description>
-      <type><![CDATA[MultiPolygon]]></type>
-      <nullable>false</nullable>
-    </attribute>
-  </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/geofla/files.xml b/validator-core/src/test/resources/config-xml/geofla/files.xml
deleted file mode 100644
index 5ca355a9..00000000
--- a/validator-core/src/test/resources/config-xml/geofla/files.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <id>788</id>
-  <name><![CDATA[GEOFLA]]></name>
-  <description><![CDATA[Exemple de modèle de document]]></description>
-  <files>
-    <file>
-      <id>8766</id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[COMMUNE]]></name>
-      <description><![CDATA[Communes dans les fichiers GEOFLA]]></description>
-      <path><![CDATA[COMMUNE]]></path>
-      <mandatory>OPTIONAL</mandatory>
-    </file>
-    <file>
-      <id>8766</id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[LIMITE_COMMUNE]]></name>
-      <description><![CDATA[Limite des communes dans les fichiers GEOFLA]]></description>
-      <path><![CDATA[LIMITE_COMMUNE]]></path>
-      <mandatory>OPTIONAL</mandatory>
-    </file>
-  </files>
-</document>
diff --git a/validator-core/src/test/resources/config-xml/geofla/types/COMMUNE.xml b/validator-core/src/test/resources/config-xml/geofla/types/COMMUNE.xml
deleted file mode 100644
index 09624924..00000000
--- a/validator-core/src/test/resources/config-xml/geofla/types/COMMUNE.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<featureType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<typeName>COMMUNE</typeName>
-    <attributes>
-        <attribute>
-            <name>GEOMETRY</name>
-            <type>Geometry</type>
-            <definition>GEOMETRY</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>ID_GEOFLA</name>
-            <type>String</type>
-            <definition>ID_GEOFLA</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>CODE_COM</name>
-            <type>String</type>
-            <definition>CODE_COM</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>INSEE_COM</name>
-            <type>String</type>
-            <definition>INSEE_COM</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>NOM_COM</name>
-            <type>String</type>
-            <definition>NOM_COM</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>STATUT</name>
-            <type>String</type>
-            <definition>STATUT</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>X_CHF_LIEU</name>
-            <type>String</type>
-            <definition>X_CHF_LIEU</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>Y_CHF_LIEU</name>
-            <type>String</type>
-            <definition>Y_CHF_LIEU</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>X_CENTROID</name>
-            <type>String</type>
-            <definition>X_CENTROID</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>Y_CENTROID</name>
-            <type>String</type>
-            <definition>Y_CENTROID</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>Z_MOYEN</name>
-            <type>String</type>
-            <definition>Z_MOYEN</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>SUPERFICIE</name>
-            <type>String</type>
-            <definition>SUPERFICIE</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>POPULATION</name>
-            <type>String</type>
-            <definition>POPULATION</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>CODE_CANT</name>
-            <type>String</type>
-            <definition>CODE_CANT</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>CODE_ARR</name>
-            <type>String</type>
-            <definition>CODE_ARR</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>CODE_DEPT</name>
-            <type>String</type>
-            <definition>CODE_DEPT</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>NOM_DEPT</name>
-            <type>String</type>
-            <definition>NOM_DEPT</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>CODE_REG</name>
-            <type>String</type>
-            <definition>CODE_REG</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>NOM_REG</name>
-            <type>String</type>
-            <definition>NOM_REG</definition>
-            <nullable>false</nullable>
-        </attribute>
-    </attributes>
-</featureType>
-
diff --git a/validator-core/src/test/resources/config-xml/geofla/types/LIMITE_COMMUNE.xml b/validator-core/src/test/resources/config-xml/geofla/types/LIMITE_COMMUNE.xml
deleted file mode 100644
index fd0345b6..00000000
--- a/validator-core/src/test/resources/config-xml/geofla/types/LIMITE_COMMUNE.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<featureType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<typeName>LIMITE_COMMUNE</typeName>
-    <attributes>
-        <attribute>
-            <name>GEOMETRY</name>
-            <type>Geometry</type>
-            <definition>GEOMETRY</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>ID_GEOFLA</name>
-            <type>String</type>
-            <definition>ID_GEOFLA</definition>
-            <nullable>false</nullable>
-        </attribute>
-        <attribute>
-            <name>NATURE</name>
-            <type>String</type>
-            <definition>NATURE</definition>
-            <nullable>false</nullable>
-        </attribute>
-    </attributes>
-</featureType>
\ No newline at end of file
diff --git a/validator-core/src/test/resources/config-xml/missing_feature_type/files.xml b/validator-core/src/test/resources/config-xml/missing_feature_type/files.xml
deleted file mode 100644
index 14a72dc9..00000000
--- a/validator-core/src/test/resources/config-xml/missing_feature_type/files.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document>
-  <id><![CDATA[]]></id>
-  <name><![CDATA[missing_feature_type]]></name>
-  <description><![CDATA[Sample configuration with a missing FeatureType)]]></description>
-  <regexp><![CDATA[+[a-Z]]]></regexp>
-  <files>
-    <file>
-      <id><![CDATA[]]></id>
-      <type><![CDATA[table]]></type>
-      <name><![CDATA[MY_TABLE]]></name>
-      <path><![CDATA[MY_TABLE]]></path>
-      <mandatory><![CDATA[ERROR]]></mandatory>
-    </file>
-  </files>
-</document>
diff --git a/validator-core/src/test/resources/config-xml/sample-document/files.xml b/validator-core/src/test/resources/config-xml/sample-document/files.xml
deleted file mode 100644
index 2c5ff628..00000000
--- a/validator-core/src/test/resources/config-xml/sample-document/files.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<document>
-    <name>ccccc_CC_dddddddd</name>
-    <regexp>[0-9]{5}_CC_[0-9]{8}</regexp>
-    <files>
-        <file>
-            <name>SIMPLE</name>
-            <type>table</type>
-            <path>(N_)?SIMPLE(_(02A|02B|[0-9]{3}))?</path>
-            <mandatory>WARN</mandatory>
-        </file>
-        <file>
-            <name>Donnees_geographiques</name>
-            <type>directory</type>
-            <path>Donnees_geographiques</path>
-            <mandatory>ERROR</mandatory>
-        </file>
-        <file>
-            <name>COMMUNE</name>
-            <type>table</type>
-            <path>Donnees_geographiques/(N_)?COMMUNE(_[0-9]{5})?(_(02A|02B|[0-9]{3}))?</path>
-            <mandatory>WARN</mandatory>
-        </file>
-    </files>
-</document>
diff --git a/validator-core/src/test/resources/config-xml/sample-document/types/COMMUNE.xml b/validator-core/src/test/resources/config-xml/sample-document/types/COMMUNE.xml
deleted file mode 100644
index 90fd523a..00000000
--- a/validator-core/src/test/resources/config-xml/sample-document/types/COMMUNE.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<featureType>
-    <typeName>COMMUNE</typeName>
-    <description>La table des communes</description>
-    <attributes>
-        <attribute>
-            <name>INSEE</name>
-            <type>String</type>
-            <regexp>[0-9]{5}</regexp>
-            <nullable>false</nullable>
-            <identifier>true</identifier>
-        </attribute>
-        <attribute>
-            <name>CODE_DEPT</name>
-            <type>String</type>
-            <nullable>false</nullable>
-            <identifier>false</identifier>
-            <listOfValues>
-                <value>01</value>
-                <value>02</value>
-            </listOfValues>
-        </attribute>
-        <attribute>
-            <name>DETRUIT</name>
-            <type>Boolean</type>
-            <nullable>true</nullable>
-            <identifier>false</identifier>
-        </attribute>
-    </attributes>
-</featureType>
diff --git a/validator-core/src/test/resources/config-xml/sample-document/types/SIMPLE.xml b/validator-core/src/test/resources/config-xml/sample-document/types/SIMPLE.xml
deleted file mode 100644
index 93b5ce43..00000000
--- a/validator-core/src/test/resources/config-xml/sample-document/types/SIMPLE.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<featureType>
-  <id>64594</id>
-  <typeName><![CDATA[SIMPLE]]></typeName>
-  <description><![CDATA[TABLE TEST]]></description>
-  <attributes>
-    <attribute>
-      <id>130278</id>
-      <name><![CDATA[ID]]></name>
-      <description><![CDATA[Identifiant]]></description>
-      <type><![CDATA[Integer]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id>130279</id>
-      <name><![CDATA[NAME]]></name>
-      <description><![CDATA[Nom]]></description>
-      <type><![CDATA[String]]></type>
-      <nullable>false</nullable>
-    </attribute>
-    <attribute>
-      <id>130280</id>
-      <name><![CDATA[GEOMETRY]]></name>
-      <type><![CDATA[Geometry]]></type>
-      <nullable>true</nullable>
-    </attribute>
-  </attributes>
-  <document_model>
-    <id>786</id>
-    <name><![CDATA[TEST]]></name>
-    <description><![CDATA[TEST]]></description>
-    <featureTypes>
-      <featureType/>
-    </featureTypes>
-  </document_model>
-</featureType>
-
diff --git a/validator-core/src/test/resources/normalizer/expected_adresse_normalized.csv b/validator-core/src/test/resources/normalizer/expected_adresse_normalized.csv
index 0f0e3e36..2fa253cb 100644
--- a/validator-core/src/test/resources/normalizer/expected_adresse_normalized.csv
+++ b/validator-core/src/test/resources/normalizer/expected_adresse_normalized.csv
@@ -1,9 +1,9 @@
-ID,ADRESSE
-1,"adresse bidon, Paris"
-5,"adresse du 15ième, Paris"
-2,"adresse au soleil, Montpellier"
-3,"adresse sympa, Montpellier"
-4,"adresse sous la pluie, Brest"
-7,"adresse d'un pub, Brest"
-6,
-7,
+ID,ADRESSE,HOMEPAGE
+1,"adresse bidon, Paris",
+5,"adresse du 15ième, Paris",
+2,"adresse au soleil, Montpellier",
+3,"adresse sympa, Montpellier",
+4,"adresse sous la pluie, Brest",
+7,"adresse d'un pub, Brest",
+6,,
+7,,