diff --git a/src/osm/jp/coverage/police/Coverage2.java b/src/osm/jp/coverage/police/Coverage2.java
index ce0bb86..3fe8b52 100644
--- a/src/osm/jp/coverage/police/Coverage2.java
+++ b/src/osm/jp/coverage/police/Coverage2.java
@@ -5,17 +5,19 @@
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 import org.xml.sax.SAXException;
 import jp.co.areaweb.tools.database.DatabaseTool;
+import osm.jp.postgis.CoverageAll;
 
 /**
  * 国土数値情報 警察署データ（平成24年:2012）
  * code = 警察署
  * @author yuu
  */
-public class Coverage2 extends osm.jp.postgis.CoverageAll {
+public class Coverage2 {
 
     public static void main(String[] args) throws FileNotFoundException, ClassNotFoundException, SQLException, IOException, ParserConfigurationException, SAXException, TransformerException
     {
@@ -23,12 +25,14 @@
         File outputFileCsv = new File(dir, "coverage.police2.csv");
         File outputFileJson = new File(dir, "coverage.police2.json");
         
-        Coverage2 obj = new Coverage2(DbPolice.TABLE_NAME);
+        CoverageAll obj = new CoverageAll();
+        obj.setTablename(DbPolice.TABLE_NAME);
+        obj.setData(new ArrayList<>());
         
         Connection conPost = DatabaseTool.openDb("postgis");
         Connection conHsql = DatabaseTool.openDb("database");
         try {
-            obj.load(conPost, conHsql);
+            obj.load(conPost, conHsql, DbPolice.TABLE_NAME, "code=2");
             obj.outputCSV(outputFileCsv);
             obj.outputJson(outputFileJson, "国土数値情報 警察署データ（平成24年:2012）2:警察署");
         }
@@ -37,13 +41,4 @@
             DatabaseTool.closeDb(conPost);
         }
     }
-
-    public Coverage2(String tableName) throws ClassNotFoundException, SQLException, IOException {
-        super(tableName);
-    }
-
-    @Override
-    public void load(Connection conPost, Connection conHsql) throws ClassNotFoundException, SQLException, IOException {
-        load(conPost, conHsql, DbPolice.TABLE_NAME, "code=2");
-    }
 }
diff --git a/src/osm/jp/coverage/police/Coverage4.java b/src/osm/jp/coverage/police/Coverage4.java
index bdd995d..f7e01f6 100644
--- a/src/osm/jp/coverage/police/Coverage4.java
+++ b/src/osm/jp/coverage/police/Coverage4.java
@@ -5,17 +5,19 @@
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 import org.xml.sax.SAXException;
 import jp.co.areaweb.tools.database.DatabaseTool;
+import osm.jp.postgis.CoverageAll;
 
 /**
  * 国土数値情報 警察署データ（平成24年:2012）
  * code = 交番
  * @author yuu
  */
-public class Coverage4 extends osm.jp.postgis.CoverageAll {
+public class Coverage4 {
 
     public static void main(String[] args) throws FileNotFoundException, ClassNotFoundException, SQLException, IOException, ParserConfigurationException, SAXException, TransformerException
     {
@@ -23,12 +25,14 @@
         File outputFileCsv = new File(dir, "coverage.police4.csv");
         File outputFileJson = new File(dir, "coverage.police4.json");
         
-        Coverage4 obj = new Coverage4(DbPolice.TABLE_NAME);
+        CoverageAll obj = new CoverageAll();
+        obj.setTablename(DbPolice.TABLE_NAME);
+        obj.setData(new ArrayList<>());
         
         Connection conPost = DatabaseTool.openDb("postgis");
         Connection conHsql = DatabaseTool.openDb("database");
         try {
-            obj.load(conPost, conHsql);
+            obj.load(conPost, conHsql, DbPolice.TABLE_NAME, "code=4");
             obj.outputCSV(outputFileCsv);
             obj.outputJson(outputFileJson, "国土数値情報 警察署データ（平成24年:2012）4:交番");
         }
@@ -37,13 +41,4 @@
             DatabaseTool.closeDb(conPost);
         }
     }
-
-    public Coverage4(String tableName) throws ClassNotFoundException, SQLException, IOException {
-        super(tableName);
-    }
-
-    @Override
-    public void load(Connection conPost, Connection conHsql) throws ClassNotFoundException, SQLException, IOException {
-        load(conPost, conHsql, DbPolice.TABLE_NAME, "code=4");
-    }
 }
diff --git a/src/osm/jp/coverage/police/Coverage5.java b/src/osm/jp/coverage/police/Coverage5.java
index a300afb..8bed251 100644
--- a/src/osm/jp/coverage/police/Coverage5.java
+++ b/src/osm/jp/coverage/police/Coverage5.java
@@ -5,17 +5,20 @@
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 import org.xml.sax.SAXException;
 import jp.co.areaweb.tools.database.DatabaseTool;
+import osm.jp.postgis.CoverageAll;
+import osm.jp.postgis.CoverageData;
 
 /**
  * 国土数値情報 警察署データ（平成24年:2012）
  * code = 派出所
  * @author yuu
  */
-public class Coverage5 extends osm.jp.postgis.CoverageAll {
+public class Coverage5 {
 
     public static void main(String[] args) throws FileNotFoundException, ClassNotFoundException, SQLException, IOException, ParserConfigurationException, SAXException, TransformerException
     {
@@ -23,12 +26,14 @@
         File outputFileCsv = new File(dir, "coverage.police5.csv");
         File outputFileJson = new File(dir, "coverage.police5.json");
         
-        Coverage5 obj = new Coverage5(DbPolice.TABLE_NAME);
+        CoverageAll obj = new CoverageAll();
+        obj.setTablename(DbPolice.TABLE_NAME);
+        obj.setData(new ArrayList<>());
         
         Connection conPost = DatabaseTool.openDb("postgis");
         Connection conHsql = DatabaseTool.openDb("database");
         try {
-            obj.load(conPost, conHsql);
+            obj.load(conPost, conHsql, DbPolice.TABLE_NAME, "code=5");
             obj.outputCSV(outputFileCsv);
             obj.outputJson(outputFileJson, "国土数値情報 警察署データ（平成24年:2012）5:派出所");
         }
@@ -38,12 +43,7 @@
         }
     }
 
-    public Coverage5(String tableName) throws ClassNotFoundException, SQLException, IOException {
-        super(tableName);
-    }
-
-    @Override
-    public void load(Connection conPost, Connection conHsql) throws ClassNotFoundException, SQLException, IOException {
-        load(conPost, conHsql, DbPolice.TABLE_NAME, "code=5");
+    public Coverage5() throws ClassNotFoundException, SQLException, IOException {
+        super();
     }
 }
diff --git a/src/osm/jp/coverage/postoffice/Coverage.java b/src/osm/jp/coverage/postoffice/Coverage.java
index c956a06..45acd08 100644
--- a/src/osm/jp/coverage/postoffice/Coverage.java
+++ b/src/osm/jp/coverage/postoffice/Coverage.java
@@ -5,12 +5,14 @@
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 import org.xml.sax.SAXException;
 import jp.co.areaweb.tools.database.DatabaseTool;
+import osm.jp.postgis.CoverageAll;
 
-public class Coverage extends osm.jp.postgis.CoverageAll {
+public class Coverage {
 
     public static void main(String[] args) throws FileNotFoundException, ClassNotFoundException, SQLException, IOException, ParserConfigurationException, SAXException, TransformerException
     {
@@ -18,12 +20,14 @@
         File outputFileCsv = new File(dir, "coverage.postoffice.csv");
         File outputFileJson = new File(dir, "coverage.postoffice.json");
         
-        Coverage obj = new Coverage(DbPostoffice.TABLE_NAME);
+        CoverageAll obj = new CoverageAll();
+        obj.setTablename(DbPostoffice.TABLE_NAME);
+        obj.setData(new ArrayList<>());
         
         Connection conPost = DatabaseTool.openDb("postgis");
         Connection conHsql = DatabaseTool.openDb("database");
         try {
-            obj.load(conPost, conHsql);
+            obj.load(conPost, conHsql, DbPostoffice.TABLE_NAME, null);
             obj.outputCSV(outputFileCsv);
             obj.outputJson(outputFileJson, "国土数値情報 郵便局データ（平成25年）");
         }
@@ -32,13 +36,4 @@
             DatabaseTool.closeDb(conPost);
         }
     }
-
-    public Coverage(String tableName) throws ClassNotFoundException, SQLException, IOException {
-        super(tableName);
-    }
-
-    @Override
-    public void load(Connection conPost, Connection conHsql) throws ClassNotFoundException, SQLException, IOException {
-        load(conPost, conHsql, DbPostoffice.TABLE_NAME, null);
-    }
 }
diff --git a/src/osm/jp/postgis/CoverageAll.java b/src/osm/jp/postgis/CoverageAll.java
index ab1286a..f6dc1f3 100644
--- a/src/osm/jp/postgis/CoverageAll.java
+++ b/src/osm/jp/postgis/CoverageAll.java
@@ -19,7 +19,7 @@
 import jp.co.areaweb.tools.csv.CsvRecord;
 import osm.jp.api.Japan;
 
-public abstract class CoverageAll extends ArrayList<CoverageData> {
+public class CoverageAll {
 
     /*
     public static void main(String[] args) throws FileNotFoundException, ClassNotFoundException, SQLException, IOException, ParserConfigurationException, SAXException, TransformerException
@@ -51,21 +51,16 @@
     public static DecimalFormat df3 = new DecimalFormat("##0.00");
     public String tableName;
     public File outputFile;
+    public ArrayList<CoverageData> data;
     
-    /**
-     * コンストラクタ
-     * @param tableName 
-     * @throws java.lang.ClassNotFoundException 
-     * @throws java.sql.SQLException 
-     * @throws java.io.IOException 
-     */
-    public CoverageAll(String tableName) 
-            throws ClassNotFoundException, SQLException, IOException 
-    {
-        super();
+    public void setTablename(String tableName) {
         this.tableName = tableName;
     }
     
+    public void setData(ArrayList<CoverageData> data) {
+        this.data = data;
+    }
+    
     /**
      * useually : load(conPost, conHsql, null);
      * 
@@ -75,8 +70,10 @@
      * @throws SQLException
      * @throws IOException 
      */
+    /*
     public abstract void load(Connection conPost, Connection conHsql)
             throws ClassNotFoundException, SQLException, IOException;
+    */
 
     /**
      *
@@ -146,7 +143,7 @@
 
             cover.par = (double)cover.molecule / cover.denominator;
             cover.par *= 100.0D;
-            this.add(cover);
+            data.add(cover);
         }
     }
 
@@ -160,17 +157,19 @@
         CsvRecord line = new CsvRecord();
         line.add("コード");
         line.add("都道府県");
-        line.add("観測数");
+        line.add("母数");
+        line.add("入力数");
         line.add("率(%)");
         csv.add(line);
         System.out.println(line.toString());
 
         try {
-            for (CoverageData cover : this) {
+            for (CoverageData cover : this.data) {
                 line = new CsvRecord();
                 line.add(String.valueOf(cover.areacode));
                 line.add(cover.name);
                 line.add(String.valueOf(cover.denominator));
+                line.add(String.valueOf(cover.molecule));
                 line.add(String.valueOf(df3.format(cover.par)));
                 csv.add(line);
                 System.out.println(line.toString());
@@ -193,7 +192,7 @@
             hw.write(space(level++) + "\"coverage\": [");
             hw.newLine();
             boolean head = true;
-            for (CoverageData cover : this) {
+            for (CoverageData cover : this.data) {
                 if (head == false) {
                     hw.write(space(level) + ",");
                 }
diff --git a/test/osm/jp/coverage/busstop/AllTest.java b/test/osm/jp/coverage/busstop/AllTest.java
index 0cc67ff..e5a616e 100644
--- a/test/osm/jp/coverage/busstop/AllTest.java
+++ b/test/osm/jp/coverage/busstop/AllTest.java
@@ -7,15 +7,13 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-/**
- *
- * @author yuu
- */
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
     osm.jp.coverage.busstop.DbExistBusstopTest.class,
     osm.jp.coverage.busstop.DbBusstopTest.class,
-    osm.jp.coverage.busstop.BusstopTest.class
+    osm.jp.coverage.busstop.BusstopTest.class,
+    ToPostgisTest.class,
+    CoverageTest.class
 })
 public class AllTest {
 
diff --git a/test/osm/jp/coverage/busstop/BusstopTest.java b/test/osm/jp/coverage/busstop/BusstopTest.java
index 6314b0b..9357cbe 100644
--- a/test/osm/jp/coverage/busstop/BusstopTest.java
+++ b/test/osm/jp/coverage/busstop/BusstopTest.java
@@ -9,19 +9,15 @@
 import java.text.MessageFormat;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
 import jp.co.areaweb.tools.database.DatabaseTool;
 import static org.hamcrest.CoreMatchers.is;
 import org.junit.*;
 import static org.junit.Assert.*;
-import org.xml.sax.SAXException;
 import osm.jp.api.HttpPOST;
 import osm.jp.api.Japan;
 import osm.jp.api.RectArea;
 import osm.jp.coverage.PoiTest;
 import static osm.jp.coverage.busstop.Busstop.NEER;
-import osm.jp.coverage.fuel.Fuel;
 
 /**
  *
@@ -38,13 +34,8 @@
     
     @Test
     public void test00_Fuel_main() {
-        try {
-            String[] args = new String[0];
-            Fuel.main(args);
-        }
-        catch (IOException | ClassNotFoundException | SQLException | ParserConfigurationException | TransformerException | SAXException ex) {
-            fail(ex.toString());
-        }
+        String[] args = new String[0];
+        Busstop.main(args);
     }
 
     @Test
diff --git a/test/osm/jp/coverage/busstop/CoverageTest.java b/test/osm/jp/coverage/busstop/CoverageTest.java
new file mode 100644
index 0000000..69b431a
--- /dev/null
+++ b/test/osm/jp/coverage/busstop/CoverageTest.java
@@ -0,0 +1,25 @@
+package osm.jp.coverage.busstop;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.xml.sax.SAXException;
+
+public class CoverageTest {
+    
+    @Test
+    public void testMain()  {
+        try {
+            System.out.println("main");
+            String[] args = new String[]{"outputfile.csv"};
+            Coverage.main(args);
+        }
+        catch (IOException | ClassNotFoundException | SQLException | ParserConfigurationException | TransformerException | SAXException e) {
+            fail("The test case is a prototype.");        
+        }
+    }
+
+}
diff --git a/test/osm/jp/coverage/busstop/ToPostgisTest.java b/test/osm/jp/coverage/busstop/ToPostgisTest.java
new file mode 100644
index 0000000..77baf0c
--- /dev/null
+++ b/test/osm/jp/coverage/busstop/ToPostgisTest.java
@@ -0,0 +1,20 @@
+package osm.jp.coverage.busstop;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ToPostgisTest {
+
+    @Test
+    public void testMain() {
+        System.out.println("main");
+        try {
+            String[] argv = new String[0];
+            osm.jp.coverage.fuel.ToPostgis.main(argv);
+        }
+        catch (Exception e) {
+            fail("The test case is a prototype.");        
+        }
+    }
+
+}
diff --git a/test/osm/jp/coverage/fuel/AllTest.java b/test/osm/jp/coverage/fuel/AllTest.java
index 4c759b0..765f6c2 100644
--- a/test/osm/jp/coverage/fuel/AllTest.java
+++ b/test/osm/jp/coverage/fuel/AllTest.java
@@ -10,9 +10,11 @@
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-    DbExistTest.class,
     DbFuelTest.class,
-    FuelTest.class
+    DbExistTest.class,
+    FuelTest.class,
+    ToPostgisTest.class,
+    CoverageTest.class
 })
 public class AllTest {
 
diff --git a/test/osm/jp/coverage/fuel/CoverageTest.java b/test/osm/jp/coverage/fuel/CoverageTest.java
new file mode 100644
index 0000000..8284b7a
--- /dev/null
+++ b/test/osm/jp/coverage/fuel/CoverageTest.java
@@ -0,0 +1,25 @@
+package osm.jp.coverage.fuel;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.xml.sax.SAXException;
+
+public class CoverageTest {
+
+    @Test
+    public void testMain() throws Exception {
+        try {
+            System.out.println("main");
+            String[] args = new String[0];
+            Coverage.main(args);
+        }
+        catch (IOException | ClassNotFoundException | SQLException | ParserConfigurationException | TransformerException | SAXException e) {
+            fail("The test case is a prototype.");        
+        }
+    }
+    
+}
diff --git a/test/osm/jp/coverage/fuel/ToPostgisTest.java b/test/osm/jp/coverage/fuel/ToPostgisTest.java
new file mode 100644
index 0000000..01b13ec
--- /dev/null
+++ b/test/osm/jp/coverage/fuel/ToPostgisTest.java
@@ -0,0 +1,19 @@
+package osm.jp.coverage.fuel;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ToPostgisTest {
+    
+    @Test
+    public void testMain() {
+        System.out.println("main");
+        try {
+            String[] argv = new String[0];
+            ToPostgis.main(argv);
+        }
+        catch (Exception e) {
+            fail("The test case is a prototype.");        
+        }
+    }
+}
diff --git a/test/osm/jp/coverage/police/AllTest.java b/test/osm/jp/coverage/police/AllTest.java
index 0dadaf0..2473774 100644
--- a/test/osm/jp/coverage/police/AllTest.java
+++ b/test/osm/jp/coverage/police/AllTest.java
@@ -14,7 +14,9 @@
     DbExistTest.class,
     PoliceTest.class,
     ToPostgisTest.class,
-    Coverage2.class
+    Coverage2.class,
+    Coverage4.class,
+    Coverage5.class
 })
 public class AllTest {
 
diff --git a/test/osm/jp/coverage/police/Coverage2Test.java b/test/osm/jp/coverage/police/Coverage2Test.java
index e623530..01e8dbd 100644
--- a/test/osm/jp/coverage/police/Coverage2Test.java
+++ b/test/osm/jp/coverage/police/Coverage2Test.java
@@ -18,7 +18,7 @@
     public void testMain()  {
         try {
             System.out.println("main");
-            String[] args = null;
+            String[] args = new String[0];
             Coverage2.main(args);
         }
         catch (IOException | ClassNotFoundException | SQLException | ParserConfigurationException | TransformerException | SAXException e) {
diff --git a/test/osm/jp/coverage/police/Coverage4Test.java b/test/osm/jp/coverage/police/Coverage4Test.java
new file mode 100644
index 0000000..6013127
--- /dev/null
+++ b/test/osm/jp/coverage/police/Coverage4Test.java
@@ -0,0 +1,29 @@
+package osm.jp.coverage.police;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.xml.sax.SAXException;
+
+/**
+ *
+ * @author yuu
+ */
+public class Coverage4Test {
+
+    @Test
+    public void testMain()  {
+        try {
+            System.out.println("main");
+            String[] args = new String[0];
+            Coverage4.main(args);
+        }
+        catch (IOException | ClassNotFoundException | SQLException | ParserConfigurationException | TransformerException | SAXException e) {
+            fail("The test case is a prototype.");        
+        }
+    }
+    
+}
diff --git a/test/osm/jp/coverage/police/Coverage5Test.java b/test/osm/jp/coverage/police/Coverage5Test.java
new file mode 100644
index 0000000..a829520
--- /dev/null
+++ b/test/osm/jp/coverage/police/Coverage5Test.java
@@ -0,0 +1,29 @@
+package osm.jp.coverage.police;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.xml.sax.SAXException;
+
+/**
+ *
+ * @author yuu
+ */
+public class Coverage5Test {
+
+    @Test
+    public void testMain()  {
+        try {
+            System.out.println("main");
+            String[] args = new String[0];
+            Coverage5.main(args);
+        }
+        catch (IOException | ClassNotFoundException | SQLException | ParserConfigurationException | TransformerException | SAXException e) {
+            fail("The test case is a prototype.");        
+        }
+    }
+    
+}
diff --git a/test/osm/jp/coverage/postoffice/AllTest.java b/test/osm/jp/coverage/postoffice/AllTest.java
index 9c14a5a..f277d70 100644
--- a/test/osm/jp/coverage/postoffice/AllTest.java
+++ b/test/osm/jp/coverage/postoffice/AllTest.java
@@ -12,7 +12,9 @@
 @Suite.SuiteClasses({
     DbPostofficeTest.class,
     DbExistTest.class,
-    PostofficeTest.class
+    PostofficeTest.class,
+    ToPostgisTest.class,
+    CoverageTest.class
 })
 public class AllTest {
 
diff --git a/test/osm/jp/coverage/postoffice/CoverageTest.java b/test/osm/jp/coverage/postoffice/CoverageTest.java
new file mode 100644
index 0000000..6ea2d63
--- /dev/null
+++ b/test/osm/jp/coverage/postoffice/CoverageTest.java
@@ -0,0 +1,25 @@
+package osm.jp.coverage.postoffice;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.TransformerException;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import org.xml.sax.SAXException;
+
+public class CoverageTest {
+    
+    @Test
+    public void testMain() {
+        try {
+            System.out.println("main");
+            String[] args = new String[0];
+            Coverage.main(args);
+        }
+        catch (IOException | ClassNotFoundException | SQLException | ParserConfigurationException | TransformerException | SAXException e) {
+            fail("The test case is a prototype.");        
+        }
+    }
+    
+}
diff --git a/test/osm/jp/coverage/postoffice/ToPostgisTest.java b/test/osm/jp/coverage/postoffice/ToPostgisTest.java
new file mode 100644
index 0000000..c6d5a77
--- /dev/null
+++ b/test/osm/jp/coverage/postoffice/ToPostgisTest.java
@@ -0,0 +1,24 @@
+package osm.jp.coverage.postoffice;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author yuu
+ */
+public class ToPostgisTest {
+    
+    @Test
+    public void testMain() {
+        System.out.println("main");
+        try {
+            String[] argv = new String[0];
+            ToPostgis.main(argv);
+        }
+        catch (Exception e) {
+            fail("The test case is a prototype.");        
+        }
+    }
+    
+}