diff --git a/bdtopo/src/main/groovy/org/orbisgis/geoclimate/bdtopo/AbstractBDTopoWorkflow.groovy b/bdtopo/src/main/groovy/org/orbisgis/geoclimate/bdtopo/AbstractBDTopoWorkflow.groovy
index 7bb16c6efc..cf36e6b7aa 100644
--- a/bdtopo/src/main/groovy/org/orbisgis/geoclimate/bdtopo/AbstractBDTopoWorkflow.groovy
+++ b/bdtopo/src/main/groovy/org/orbisgis/geoclimate/bdtopo/AbstractBDTopoWorkflow.groovy
@@ -447,20 +447,20 @@ abstract class AbstractBDTopoWorkflow extends BDTopoUtils {
         def defaultParameters = [distance       : 1000f,
                                  distance_buffer: 500f, prefixName: "",
                                  hLevMin        : 3]
-        def rsu_indicators_default = [indicatorUse      : [],
-                                      svfSimplified     : true,
-                                      surface_vegetation: 10000f,
-                                      surface_hydro     : 2500f,
+        def rsu_indicators_default = [indicatorUse       : [],
+                                      svfSimplified      : true,
+                                      surface_vegetation : 10000f,
+                                      surface_hydro      : 2500f,
                                       surface_urban_areas: 10000f,
-                                      snappingTolerance : 0.01f,
-                                      mapOfWeights      : ["sky_view_factor"             : 4,
-                                                           "aspect_ratio"                : 3,
-                                                           "building_surface_fraction"   : 8,
-                                                           "impervious_surface_fraction" : 0,
-                                                           "pervious_surface_fraction"   : 0,
-                                                           "height_of_roughness_elements": 6,
-                                                           "terrain_roughness_length"    : 0.5],
-                                      utrfModelName     : "UTRF_BDTOPO_V2_RF_2_2.model"]
+                                      snappingTolerance  : 0.01f,
+                                      mapOfWeights       : ["sky_view_factor"             : 4,
+                                                            "aspect_ratio"                : 3,
+                                                            "building_surface_fraction"   : 8,
+                                                            "impervious_surface_fraction" : 0,
+                                                            "pervious_surface_fraction"   : 0,
+                                                            "height_of_roughness_elements": 6,
+                                                            "terrain_roughness_length"    : 0.5],
+                                      utrfModelName      : "UTRF_BDTOPO_V2_RF_2_2.model"]
         defaultParameters.put("rsu_indicators", rsu_indicators_default)
 
         if (processing_parameters) {
@@ -564,13 +564,13 @@ abstract class AbstractBDTopoWorkflow extends BDTopoUtils {
                         def grid_indicators_tmp = [
                                 "x_size"    : x_size,
                                 "y_size"    : y_size,
-                                "output"    : "geojson",
+                                "output"    : "fgb",
                                 "rowCol"    : false,
                                 "indicators": allowedOutputIndicators
                         ]
                         def grid_output = grid_indicators.output
                         if (grid_output) {
-                            if (grid_output.toLowerCase() in ["asc", "geojson"]) {
+                            if (grid_output.toLowerCase() in ["asc", "fgb"]) {
                                 grid_indicators_tmp.output = grid_output.toLowerCase()
                             }
                         }
@@ -675,7 +675,7 @@ abstract class AbstractBDTopoWorkflow extends BDTopoUtils {
         //Add the GIS layers to the list of results
         def outputTableNamesResult = [:]
         def grid_indicators_params = processing_parameters.grid_indicators
-        def outputGrid = "geojson"
+        def outputGrid = "fgb"
         if (grid_indicators_params) {
             outputGrid = grid_indicators_params.output
         }
@@ -936,7 +936,7 @@ abstract class AbstractBDTopoWorkflow extends BDTopoUtils {
                 Map geoIndicators = Geoindicators.WorkflowGeoIndicators.computeAllGeoIndicators(h2gis_datasource, zone,
                         building, road,
                         rail, vegetation,
-                        water, impervious, "", "", urban_areas,"",
+                        water, impervious, "", "", urban_areas, "",
                         rsu_indicators_params, processing_parameters.prefixName)
                 if (!geoIndicators) {
                     error "Cannot build the geoindicators for the zone $id_zone"
@@ -961,7 +961,7 @@ abstract class AbstractBDTopoWorkflow extends BDTopoUtils {
                         if (!building) {
                             info "Cannot compute any population data at building level"
                         }
-                        tablesToDrop<<results.building
+                        tablesToDrop << results.building
                         //Update the building table with the population data
                         results.put("building", building)
 
@@ -1003,12 +1003,12 @@ abstract class AbstractBDTopoWorkflow extends BDTopoUtils {
                         if (ground_acoustic) {
                             results.put("ground_acoustic", ground_acoustic)
                         }
-                        tablesToDrop<<gridP
+                        tablesToDrop << gridP
                     }
                 }
             }
             //Clean the database
-            if(tablesToDrop) {
+            if (tablesToDrop) {
                 h2gis_datasource.execute("DROP TABLE IF EXISTS ${tablesToDrop.join(",")}".toString())
             }
             info "${id_zone} has been processed"
@@ -1018,7 +1018,7 @@ abstract class AbstractBDTopoWorkflow extends BDTopoUtils {
     }
 
 /**
- * Save the geoclimate tables into geojson files
+ * Save the geoclimate tables into files
  * @param id_zone the id of the zone
  * @param results a list of tables computed by geoclimate
  * @param outputFolder the output folder
@@ -1029,13 +1029,13 @@ abstract class AbstractBDTopoWorkflow extends BDTopoUtils {
     def saveOutputFiles(def h2gis_datasource, def results, def outputFiles, def outputFolder, def outputSRID, def reproject, def deleteOutputData, def outputGrid) {
         outputFiles.each {
             if (it == "grid_indicators") {
-                if (outputGrid == "geojson") {
-                    Geoindicators.WorkflowUtilities.saveToGeojson(results."$it", "${outputFolder + File.separator + it}.fgb", h2gis_datasource, outputSRID, reproject, deleteOutputData)
+                if (outputGrid == "fgb") {
+                    Geoindicators.WorkflowUtilities.saveInFile(results."$it", "${outputFolder + File.separator + it}.fgb", h2gis_datasource, outputSRID, reproject, deleteOutputData)
                 } else if (outputGrid == "asc") {
                     Geoindicators.WorkflowUtilities.saveToAscGrid(results."$it", outputFolder, it, h2gis_datasource, outputSRID, reproject, deleteOutputData)
                 }
             } else {
-                Geoindicators.WorkflowUtilities.saveToGeojson(results."$it", "${outputFolder + File.separator + it}.geojson", h2gis_datasource, outputSRID, reproject, deleteOutputData)
+                Geoindicators.WorkflowUtilities.saveInFile(results."$it", "${outputFolder + File.separator + it}.fgb", h2gis_datasource, outputSRID, reproject, deleteOutputData)
             }
         }
     }
diff --git a/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/WorkflowAbstractTest.groovy b/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/WorkflowAbstractTest.groovy
index 5e76443916..43dd7322e0 100644
--- a/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/WorkflowAbstractTest.groovy
+++ b/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/WorkflowAbstractTest.groovy
@@ -30,8 +30,7 @@ import static org.junit.jupiter.api.Assertions.*
 
 abstract class WorkflowAbstractTest {
 
-    @TempDir(cleanup = CleanupMode.ON_SUCCESS)
-    static File folder
+
 
     /**
      * Get the version of the workflow
diff --git a/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/v2/WorkflowBDTopoV2Test.groovy b/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/v2/WorkflowBDTopoV2Test.groovy
index f37b7630f7..3aec0944b1 100644
--- a/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/v2/WorkflowBDTopoV2Test.groovy
+++ b/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/v2/WorkflowBDTopoV2Test.groovy
@@ -19,36 +19,17 @@
  */
 package org.orbisgis.geoclimate.bdtopo.v2
 
+import org.junit.jupiter.api.io.CleanupMode
+import org.junit.jupiter.api.io.TempDir
 import org.orbisgis.data.H2GIS
 import org.orbisgis.geoclimate.bdtopo.WorkflowAbstractTest
-
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
 import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertEquals
-import static org.junit.jupiter.api.Assertions.assertTrue
-import static org.junit.jupiter.api.Assertions.assertTrue
-import static org.junit.jupiter.api.Assertions.assertTrue
-import static org.junit.jupiter.api.Assertions.assertTrue
 import static org.junit.jupiter.api.Assertions.assertTrue
 
 class WorkflowBDTopoV2Test extends WorkflowAbstractTest {
 
+    @TempDir(cleanup = CleanupMode.ON_SUCCESS)
+    static File folder
 
     @Override
     ArrayList getFileNames() {
diff --git a/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/v3/WorkflowBDTopoV3Test.groovy b/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/v3/WorkflowBDTopoV3Test.groovy
index 2bdc37c10f..a6ee12691c 100644
--- a/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/v3/WorkflowBDTopoV3Test.groovy
+++ b/bdtopo/src/test/groovy/org/orbisgis/geoclimate/bdtopo/v3/WorkflowBDTopoV3Test.groovy
@@ -20,7 +20,8 @@
 package org.orbisgis.geoclimate.bdtopo.v3
 
 
-import org.junit.jupiter.api.*
+import org.junit.jupiter.api.io.CleanupMode
+import org.junit.jupiter.api.io.TempDir
 import org.orbisgis.data.H2GIS
 import org.orbisgis.geoclimate.bdtopo.WorkflowAbstractTest
 
@@ -29,11 +30,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue
 
 class WorkflowBDTopoV3Test extends WorkflowAbstractTest {
 
+    @TempDir(cleanup = CleanupMode.ON_SUCCESS)
+    static File folder
+
 
-    public WorkflowBDTopoV3Test(){
-        new File("/tmp/test_bd").mkdir()
-        folder = new File("/tmp/test_bd")
-    }
     @Override
     int getVersion() {
         return 3
diff --git a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowUtilities.groovy b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowUtilities.groovy
index f678650bcf..efb4391879 100644
--- a/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowUtilities.groovy
+++ b/geoindicators/src/main/groovy/org/orbisgis/geoclimate/geoindicators/WorkflowUtilities.groovy
@@ -212,7 +212,7 @@ def saveToAscGrid(def outputTable, def subFolder, def filePrefix, JdbcDataSource
 }
 
 /**
- * Method to save a table into a geojson file
+ * Method to save a table into a file
  * @param outputTable name of the table to export
  * @param filePath path to save the table
  * @param h2gis_datasource connection to the database
@@ -220,7 +220,7 @@ def saveToAscGrid(def outputTable, def subFolder, def filePrefix, JdbcDataSource
  * @param reproject true if the file must be reprojected
  * @param deleteOutputData true to delete the file if exists
  */
-def saveToGeojson(def outputTable, def filePath, H2GIS h2gis_datasource, def outputSRID, def reproject, def deleteOutputData) {
+def saveInFile(def outputTable, def filePath, H2GIS h2gis_datasource, def outputSRID, def reproject, def deleteOutputData) {
     if (outputTable && h2gis_datasource.hasTable(outputTable)) {
         if (!reproject) {
             h2gis_datasource.save(outputTable, filePath, deleteOutputData)
diff --git a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy
index 042b10b11f..0152ed1343 100644
--- a/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy
+++ b/osm/src/main/groovy/org/orbisgis/geoclimate/osm/WorkflowOSM.groovy
@@ -71,7 +71,7 @@ import java.sql.SQLException
  *  *             ,
  *  *  [OPTIONAL ENTRY]  "output" :{ //If not ouput is set the results are keep in the local database
  *  *             "srid" : //optional value to reproject the data
- *  *             "folder" : "/tmp/myResultFolder" //tmp folder to store the computed layers in a geojson format,
+ *  *             "folder" : "/tmp/myResultFolder" //tmp folder to store the computed layers in a fgb format,
  *  *             "database": { //database parameters to store the computed layers.
  *  *                  "user": "-",
  *  *                  "password": "-",
@@ -633,7 +633,7 @@ Map osm_processing(JdbcDataSource h2gis_datasource, def processing_parameters, d
                         }
                     }
                     //Default
-                    def outputGrid = "geojson"
+                    def outputGrid = "fgb"
                     if (grid_indicators_params) {
                         if (!geomEnv) {
                             geomEnv = h2gis_datasource.getSpatialTable(utm_zone_table).getExtent()
@@ -916,13 +916,13 @@ def extractProcessingParameters(def processing_parameters) {
                     def grid_indicators_tmp = [
                             "x_size"    : x_size,
                             "y_size"    : y_size,
-                            "output"    : "geojson",
+                            "output"    : "fgb",
                             "rowCol"    : false,
                             "indicators": allowedOutputIndicators
                     ]
                     def grid_output = grid_indicators.output
                     if (grid_output) {
-                        if (grid_output.toLowerCase() in ["asc", "geojson"]) {
+                        if (grid_output.toLowerCase() in ["asc", "fgb"]) {
                             grid_indicators_tmp.output = grid_output.toLowerCase()
                         }
                     }
@@ -967,7 +967,7 @@ def extractProcessingParameters(def processing_parameters) {
 
 
 /**
- * Save the geoclimate tables into geojson files
+ * Save the geoclimate tables into files
  * @param id_zone the id of the zone
  * @param results a list of tables computed by geoclimate
  * @param ouputFolder the ouput folder
@@ -988,15 +988,15 @@ def saveOutputFiles(def h2gis_datasource, def id_zone, def results, def outputFi
     }
     outputFiles.each {
         if (it == "grid_indicators") {
-            if (outputGrid == "geojson") {
-                Geoindicators.WorkflowUtilities.saveToGeojson(results."$it", "${subFolder.getAbsolutePath() + File.separator + it}.geojson", h2gis_datasource, outputSRID, reproject, deleteOutputData)
+            if (outputGrid == "fgb") {
+                Geoindicators.WorkflowUtilities.saveInFile(results."$it", "${subFolder.getAbsolutePath() + File.separator + it}.fgb", h2gis_datasource, outputSRID, reproject, deleteOutputData)
             } else if (outputGrid == "asc") {
                 Geoindicators.WorkflowUtilities.saveToAscGrid(results."$it", subFolder.getAbsolutePath(), it, h2gis_datasource, outputSRID, reproject, deleteOutputData)
             }
         } else if (it == "building_height_missing") {
             Geoindicators.WorkflowUtilities.saveToCSV(results."$it", "${subFolder.getAbsolutePath() + File.separator + it}.csv", h2gis_datasource, deleteOutputData)
         } else {
-            Geoindicators.WorkflowUtilities.saveToGeojson(results."$it", "${subFolder.getAbsolutePath() + File.separator + it}.geojson", h2gis_datasource, outputSRID, reproject, deleteOutputData)
+            Geoindicators.WorkflowUtilities.saveInFile(results."$it", "${subFolder.getAbsolutePath() + File.separator + it}.fgb", h2gis_datasource, outputSRID, reproject, deleteOutputData)
         }
     }
 }