diff --git a/unit-test/include/class_acc_accountTest.php b/unit-test/include/class/class_acc_accountTest.php
similarity index 100%
rename from unit-test/include/class_acc_accountTest.php
rename to unit-test/include/class/class_acc_accountTest.php
diff --git a/unit-test/include/class_acc_account_ledgerTest.php b/unit-test/include/class/class_acc_account_ledgerTest.php
similarity index 100%
rename from unit-test/include/class_acc_account_ledgerTest.php
rename to unit-test/include/class/class_acc_account_ledgerTest.php
diff --git a/unit-test/include/class_acc_balanceTest.php b/unit-test/include/class/class_acc_balanceTest.php
similarity index 100%
rename from unit-test/include/class_acc_balanceTest.php
rename to unit-test/include/class/class_acc_balanceTest.php
diff --git a/unit-test/include/class_acc_bilanTest.php b/unit-test/include/class/class_acc_bilanTest.php
similarity index 100%
rename from unit-test/include/class_acc_bilanTest.php
rename to unit-test/include/class/class_acc_bilanTest.php
diff --git a/unit-test/include/class_acc_computeTest.php b/unit-test/include/class/class_acc_computeTest.php
similarity index 100%
rename from unit-test/include/class_acc_computeTest.php
rename to unit-test/include/class/class_acc_computeTest.php
diff --git a/unit-test/include/class_acc_ledgerTest.php b/unit-test/include/class/class_acc_ledgerTest.php
similarity index 100%
rename from unit-test/include/class_acc_ledgerTest.php
rename to unit-test/include/class/class_acc_ledgerTest.php
diff --git a/unit-test/include/class_acc_ledger_finTest.php b/unit-test/include/class/class_acc_ledger_finTest.php
similarity index 100%
rename from unit-test/include/class_acc_ledger_finTest.php
rename to unit-test/include/class/class_acc_ledger_finTest.php
diff --git a/unit-test/include/class_acc_ledger_purchaseTest.php b/unit-test/include/class/class_acc_ledger_purchaseTest.php
similarity index 100%
rename from unit-test/include/class_acc_ledger_purchaseTest.php
rename to unit-test/include/class/class_acc_ledger_purchaseTest.php
diff --git a/unit-test/include/class_acc_ledger_soldTest.php b/unit-test/include/class/class_acc_ledger_soldTest.php
similarity index 100%
rename from unit-test/include/class_acc_ledger_soldTest.php
rename to unit-test/include/class/class_acc_ledger_soldTest.php
diff --git a/unit-test/include/class_acc_parm_codeTest.php b/unit-test/include/class/class_acc_parm_codeTest.php
similarity index 100%
rename from unit-test/include/class_acc_parm_codeTest.php
rename to unit-test/include/class/class_acc_parm_codeTest.php
diff --git a/unit-test/include/class_anc_accountTest.php b/unit-test/include/class/class_anc_accountTest.php
similarity index 100%
rename from unit-test/include/class_anc_accountTest.php
rename to unit-test/include/class/class_anc_accountTest.php
diff --git a/unit-test/include/class_anc_grandlivreTest.php b/unit-test/include/class/class_anc_grandlivreTest.php
similarity index 100%
rename from unit-test/include/class_anc_grandlivreTest.php
rename to unit-test/include/class/class_anc_grandlivreTest.php
diff --git a/unit-test/include/class_anc_keyTest.php b/unit-test/include/class/class_anc_keyTest.php
similarity index 100%
rename from unit-test/include/class_anc_keyTest.php
rename to unit-test/include/class/class_anc_keyTest.php
diff --git a/unit-test/include/class_anc_key_sqlTest.php b/unit-test/include/class/class_anc_key_sqlTest.php
similarity index 100%
rename from unit-test/include/class_anc_key_sqlTest.php
rename to unit-test/include/class/class_anc_key_sqlTest.php
diff --git a/unit-test/include/class_anc_operationTest.php b/unit-test/include/class/class_anc_operationTest.php
similarity index 100%
rename from unit-test/include/class_anc_operationTest.php
rename to unit-test/include/class/class_anc_operationTest.php
diff --git a/unit-test/include/class_ficheTest.php b/unit-test/include/class/class_ficheTest.php
similarity index 100%
rename from unit-test/include/class_ficheTest.php
rename to unit-test/include/class/class_ficheTest.php
diff --git a/unit-test/include/class_default_menu_sqlTest.php b/unit-test/include/class_default_menu_sqlTest.php
deleted file mode 100644
index 7f6872034..000000000
--- a/unit-test/include/class_default_menu_sqlTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-08 at 14:23:53.
- */
-class Default_Menu_SQLTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var Default_Menu_SQL
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object=new Default_Menu_SQL;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-}
diff --git a/unit-test/include/class_document_exportTest.php b/unit-test/include/class_document_exportTest.php
deleted file mode 100644
index 6381fdf00..000000000
--- a/unit-test/include/class_document_exportTest.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-08 at 14:23:53.
- */
-class Document_ExportTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var Document_Export
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object=new Document_Export;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-    /**
-     * @covers Document_Export::concatenate_pdf
-     * @todo   Implement testConcatenate_pdf().
-     */
-    public function testConcatenate_pdf()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Document_Export::move_file
-     * @todo   Implement testMove_file().
-     */
-    public function testMove_file()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Document_Export::send_pdf
-     * @todo   Implement testSend_pdf().
-     */
-    public function testSend_pdf()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Document_Export::clean_folder
-     * @todo   Implement testClean_folder().
-     */
-    public function testClean_folder()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Document_Export::export_all
-     * @todo   Implement testExport_all().
-     */
-    public function testExport_all()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Document_Export::check_file
-     * @todo   Implement testCheck_file().
-     */
-    public function testCheck_file()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-}
diff --git a/unit-test/include/class_follow_upTest.php b/unit-test/include/class_follow_upTest.php
deleted file mode 100644
index 02df8c38a..000000000
--- a/unit-test/include/class_follow_upTest.php
+++ /dev/null
@@ -1,428 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-07 at 23:05:35.
- */
-class Follow_UpTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var Follow_Up
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object=new Follow_Up;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-    /**
-     * @covers Follow_Up::sql_security_filter
-     * @todo   Implement testSql_security_filter().
-     */
-    public function testSql_security_filter()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::Display
-     * @todo   Implement testDisplay().
-     */
-    public function testDisplay()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::get
-     * @todo   Implement testGet().
-     */
-    public function testGet()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::save
-     * @todo   Implement testSave().
-     */
-    public function testSave()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::myList
-     * @todo   Implement testMyList().
-     */
-    public function testMyList()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::Update
-     * @todo   Implement testUpdate().
-     */
-    public function testUpdate()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::generate_document
-     * @todo   Implement testGenerate_document().
-     */
-    public function testGenerate_document()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::fromArray
-     * @todo   Implement testFromArray().
-     */
-    public function testFromArray()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::remove
-     * @todo   Implement testRemove().
-     */
-    public function testRemove()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::get_last
-     * @todo   Implement testGet_last().
-     */
-    public function testGet_last()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::get_today
-     * @todo   Implement testGet_today().
-     */
-    public function testGet_today()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::get_late
-     * @todo   Implement testGet_late().
-     */
-    public function testGet_late()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::insert_operation
-     * @todo   Implement testInsert_operation().
-     */
-    public function testInsert_operation()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::remove_operation_deprecated
-     * @todo   Implement testRemove_operation_deprecated().
-     */
-    public function testRemove_operation_deprecated()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::display_search
-     * @todo   Implement testDisplay_search().
-     */
-    public function testDisplay_search()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::show_action_list
-     * @todo   Implement testShow_action_list().
-     */
-    public function testShow_action_list()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::filter_by_tag
-     * @todo   Implement testFilter_by_tag().
-     */
-    public function testFilter_by_tag()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::create_query
-     * @todo   Implement testCreate_query().
-     */
-    public function testCreate_query()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::short_list
-     * @todo   Implement testShort_list().
-     */
-    public function testShort_list()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::insert_action
-     * @todo   Implement testInsert_action().
-     */
-    public function testInsert_action()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::export_csv
-     * @todo   Implement testExport_csv().
-     */
-    public function testExport_csv()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::get_all_operation
-     * @todo   Implement testGet_all_operation().
-     */
-    public function testGet_all_operation()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::tag_get
-     * @todo   Implement testTag_get().
-     */
-    public function testTag_get()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::tag_add
-     * @todo   Implement testTag_add().
-     */
-    public function testTag_add()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::tag_remove
-     * @todo   Implement testTag_remove().
-     */
-    public function testTag_remove()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::tag_cell
-     * @todo   Implement testTag_cell().
-     */
-    public function testTag_cell()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::action_tag_remove
-     * @todo   Implement testAction_tag_remove().
-     */
-    public function testAction_tag_remove()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::action_tag_add
-     * @todo   Implement testAction_tag_add().
-     */
-    public function testAction_tag_add()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::action_tag_clear
-     * @todo   Implement testAction_tag_clear().
-     */
-    public function testAction_tag_clear()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::action_print
-     * @todo   Implement testAction_print().
-     */
-    public function testAction_print()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::tag_clear
-     * @todo   Implement testTag_clear().
-     */
-    public function testTag_clear()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::action_set_state
-     * @todo   Implement testAction_set_state().
-     */
-    public function testAction_set_state()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up::action_remove
-     * @todo   Implement testAction_remove().
-     */
-    public function testAction_remove()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-}
diff --git a/unit-test/include/class_follow_up_detailTest.php b/unit-test/include/class_follow_up_detailTest.php
deleted file mode 100644
index 742a05409..000000000
--- a/unit-test/include/class_follow_up_detailTest.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-07 at 23:05:35.
- */
-class Follow_Up_DetailTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var Follow_Up_Detail
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object=new Follow_Up_Detail;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-    /**
-     * @covers Follow_Up_Detail::get_parameter
-     * @todo   Implement testGet_parameter().
-     */
-    public function testGet_parameter()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up_Detail::set_parameter
-     * @todo   Implement testSet_parameter().
-     */
-    public function testSet_parameter()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up_Detail::get_info
-     * @todo   Implement testGet_info().
-     */
-    public function testGet_info()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up_Detail::verify
-     * @todo   Implement testVerify().
-     */
-    public function testVerify()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up_Detail::save
-     * @todo   Implement testSave().
-     */
-    public function testSave()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up_Detail::insert
-     * @todo   Implement testInsert().
-     */
-    public function testInsert()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up_Detail::update
-     * @todo   Implement testUpdate().
-     */
-    public function testUpdate()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up_Detail::load_all
-     * @todo   Implement testLoad_all().
-     */
-    public function testLoad_all()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up_Detail::load
-     * @todo   Implement testLoad().
-     */
-    public function testLoad()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up_Detail::delete
-     * @todo   Implement testDelete().
-     */
-    public function testDelete()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up_Detail::from_array
-     * @todo   Implement testFrom_array().
-     */
-    public function testFrom_array()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Follow_Up_Detail::test_me
-     * @todo   Implement testTest_me().
-     */
-    public function testTest_me()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-}
diff --git a/unit-test/include/class_html_inputTest.php b/unit-test/include/class_html_inputTest.php
deleted file mode 100644
index 6cf6a867b..000000000
--- a/unit-test/include/class_html_inputTest.php
+++ /dev/null
@@ -1,644 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-08 at 14:23:53.
- */
-class HtmlInputTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var HtmlInput
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object=new HtmlInput;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-    /**
-     * @covers HtmlInput::setReadOnly
-     * @todo   Implement testSetReadOnly().
-     */
-    public function testSetReadOnly()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::set_attribute
-     * @todo   Implement testSet_attribute().
-     */
-    public function testSet_attribute()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::get_js_attr
-     * @todo   Implement testGet_js_attr().
-     */
-    public function testGet_js_attr()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::make_object
-     * @todo   Implement testMake_object().
-     */
-    public function testMake_object()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::debug
-     * @todo   Implement testDebug().
-     */
-    public function testDebug()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::submit
-     * @todo   Implement testSubmit().
-     */
-    public function testSubmit()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::button
-     * @todo   Implement testButton().
-     */
-    public function testButton()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::reset
-     * @todo   Implement testReset().
-     */
-    public function testReset()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::hidden
-     * @todo   Implement testHidden().
-     */
-    public function testHidden()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::extension
-     * @todo   Implement testExtension().
-     */
-    public function testExtension()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::button_anchor
-     * @todo   Implement testButton_anchor().
-     */
-    public function testButton_anchor()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::infobulle
-     * @todo   Implement testInfobulle().
-     */
-    public function testInfobulle()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::warnbulle
-     * @todo   Implement testWarnbulle().
-     */
-    public function testWarnbulle()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::detail_op
-     * @todo   Implement testDetail_op().
-     */
-    public function testDetail_op()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::detail_action
-     * @todo   Implement testDetail_action().
-     */
-    public function testDetail_action()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::detail_modele_document
-     * @todo   Implement testDetail_modele_document().
-     */
-    public function testDetail_modele_document()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::remove_stock
-     * @todo   Implement testRemove_stock().
-     */
-    public function testRemove_stock()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::history_card
-     * @todo   Implement testHistory_card().
-     */
-    public function testHistory_card()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::history_card_button
-     * @todo   Implement testHistory_card_button().
-     */
-    public function testHistory_card_button()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::history_account
-     * @todo   Implement testHistory_account().
-     */
-    public function testHistory_account()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::select_ledger
-     * @todo   Implement testSelect_ledger().
-     */
-    public function testSelect_ledger()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::select_cat
-     * @todo   Implement testSelect_cat().
-     */
-    public function testSelect_cat()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::display_periode
-     * @todo   Implement testDisplay_periode().
-     */
-    public function testDisplay_periode()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::button_close
-     * @todo   Implement testButton_close().
-     */
-    public function testButton_close()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::anchor_close
-     * @todo   Implement testAnchor_close().
-     */
-    public function testAnchor_close()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::button_action
-     * @todo   Implement testButton_action().
-     */
-    public function testButton_action()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::button_image
-     * @todo   Implement testButton_image().
-     */
-    public function testButton_image()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::anchor_hide
-     * @todo   Implement testAnchor_hide().
-     */
-    public function testAnchor_hide()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::print_window
-     * @todo   Implement testPrint_window().
-     */
-    public function testPrint_window()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::card_detail
-     * @todo   Implement testCard_detail().
-     */
-    public function testCard_detail()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::array_to_hidden
-     * @todo   Implement testArray_to_hidden().
-     */
-    public function testArray_to_hidden()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::get_to_hidden
-     * @todo   Implement testGet_to_hidden().
-     */
-    public function testGet_to_hidden()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::post_to_hidden
-     * @todo   Implement testPost_to_hidden().
-     */
-    public function testPost_to_hidden()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::request_to_hidden
-     * @todo   Implement testRequest_to_hidden().
-     */
-    public function testRequest_to_hidden()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::array_to_string
-     * @todo   Implement testArray_to_string().
-     */
-    public function testArray_to_string()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::get_to_string
-     * @todo   Implement testGet_to_string().
-     */
-    public function testGet_to_string()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::post_to_string
-     * @todo   Implement testPost_to_string().
-     */
-    public function testPost_to_string()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::request_to_string
-     * @todo   Implement testRequest_to_string().
-     */
-    public function testRequest_to_string()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::generate_id
-     * @todo   Implement testGenerate_id().
-     */
-    public function testGenerate_id()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::default_value
-     * @todo   Implement testDefault_value().
-     */
-    public function testDefault_value()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::default_value_get
-     * @todo   Implement testDefault_value_get().
-     */
-    public function testDefault_value_get()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::default_value_post
-     * @todo   Implement testDefault_value_post().
-     */
-    public function testDefault_value_post()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::default_value_request
-     * @todo   Implement testDefault_value_request().
-     */
-    public function testDefault_value_request()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::title_box
-     * @todo   Implement testTitle_box().
-     */
-    public function testTitle_box()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::anchor
-     * @todo   Implement testAnchor().
-     */
-    public function testAnchor()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::select_stock
-     * @todo   Implement testSelect_stock().
-     */
-    public function testSelect_stock()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::filter_table
-     * @todo   Implement testFilter_table().
-     */
-    public function testFilter_table()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::show_reconcile
-     * @todo   Implement testShow_reconcile().
-     */
-    public function testShow_reconcile()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::calendar_zoom
-     * @todo   Implement testCalendar_zoom().
-     */
-    public function testCalendar_zoom()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::button_choice_ledger
-     * @todo   Implement testButton_choice_ledger().
-     */
-    public function testButton_choice_ledger()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers HtmlInput::show_receipt_document
-     * @todo   Implement testShow_receipt_document().
-     */
-    public function testShow_receipt_document()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-}
diff --git a/unit-test/include/class_icardTest.php b/unit-test/include/class_icardTest.php
deleted file mode 100644
index 282acfc9d..000000000
--- a/unit-test/include/class_icardTest.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-08 at 14:23:54.
- */
-class ICardTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var ICard
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object=new ICard;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-    /**
-     * @covers ICard::set_callback
-     * @todo   Implement testSet_callback().
-     */
-    public function testSet_callback()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ICard::set_function
-     * @todo   Implement testSet_function().
-     */
-    public function testSet_function()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ICard::ipopup
-     * @todo   Implement testIpopup().
-     */
-    public function testIpopup()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ICard::set_dblclick
-     * @todo   Implement testSet_dblclick().
-     */
-    public function testSet_dblclick()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ICard::input
-     * @todo   Implement testInput().
-     */
-    public function testInput()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ICard::display
-     * @todo   Implement testDisplay().
-     */
-    public function testDisplay()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ICard::search
-     * @todo   Implement testSearch().
-     */
-    public function testSearch()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers ICard::test_me
-     * @todo   Implement testTest_me().
-     */
-    public function testTest_me()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-}
diff --git a/unit-test/include/class_menu_ref_sqlTest.php b/unit-test/include/class_menu_ref_sqlTest.php
deleted file mode 100644
index 0aee82a17..000000000
--- a/unit-test/include/class_menu_ref_sqlTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-08 at 14:25:44.
- */
-class Menu_Ref_SQLTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var Menu_Ref_SQL
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object=new Menu_Ref_SQL;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-    /**
-     * @covers Menu_Ref_SQL::test_me
-     * @todo   Implement testTest_me().
-     */
-    public function testTest_me()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-}
diff --git a/unit-test/include/class_profile_sqlTest.php b/unit-test/include/class_profile_sqlTest.php
deleted file mode 100644
index 2aa57da14..000000000
--- a/unit-test/include/class_profile_sqlTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-08 at 14:26:55.
- */
-class Profile_sqlTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var Profile_sql
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object=new Profile_sql;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-}
diff --git a/unit-test/include/class_stockTest.php b/unit-test/include/class_stockTest.php
deleted file mode 100644
index 9c516b901..000000000
--- a/unit-test/include/class_stockTest.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-08 at 14:26:55.
- */
-class StockTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var Stock
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object=new Stock;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-    /**
-     * @covers Stock::history
-     * @todo   Implement testHistory().
-     */
-    public function testHistory()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Stock::export_stock_histo_form
-     * @todo   Implement testExport_stock_histo_form().
-     */
-    public function testExport_stock_histo_form()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Stock::export_stock_summary_list_form
-     * @todo   Implement testExport_stock_summary_list_form().
-     */
-    public function testExport_stock_summary_list_form()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Stock::search_box_button
-     * @todo   Implement testSearch_box_button().
-     */
-    public function testSearch_box_button()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Stock::search_box
-     * @todo   Implement testSearch_box().
-     */
-    public function testSearch_box()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Stock::create_query_histo
-     * @todo   Implement testCreate_query_histo().
-     */
-    public function testCreate_query_histo()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Stock::summary
-     * @todo   Implement testSummary().
-     */
-    public function testSummary()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Stock::build_tmp_table
-     * @todo   Implement testBuild_tmp_table().
-     */
-    public function testBuild_tmp_table()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-}
diff --git a/unit-test/include/class_stock_goods_sqlTest.php b/unit-test/include/class_stock_goods_sqlTest.php
deleted file mode 100644
index 65f2c2b07..000000000
--- a/unit-test/include/class_stock_goods_sqlTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-08 at 14:26:55.
- */
-class Stock_Goods_SqlTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var Stock_Goods_Sql
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object=new Stock_Goods_Sql;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-}
diff --git a/unit-test/include/class_stock_sqlTest.php b/unit-test/include/class_stock_sqlTest.php
deleted file mode 100644
index df2162716..000000000
--- a/unit-test/include/class_stock_sqlTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-08 at 14:28:11.
- */
-class Stock_SqlTest extends PHPUnit_Framework_TestCase
-{
-    /**
-     * @var Stock_Sql
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object = new Stock_Sql;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-    }
-}
diff --git a/unit-test/include/class_tagTest.php b/unit-test/include/class_tagTest.php
deleted file mode 100644
index 127011ca4..000000000
--- a/unit-test/include/class_tagTest.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-09 at 16:02:14.
- */
-class TagTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var Tag
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object=new Tag;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-    /**
-     * @covers Tag::show_list
-     * @todo   Implement testShow_list().
-     */
-    public function testShow_list()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Tag::select
-     * @todo   Implement testSelect().
-     */
-    public function testSelect()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Tag::form_add
-     * @todo   Implement testForm_add().
-     */
-    public function testForm_add()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Tag::show_form_add
-     * @todo   Implement testShow_form_add().
-     */
-    public function testShow_form_add()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Tag::save
-     * @todo   Implement testSave().
-     */
-    public function testSave()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Tag::remove
-     * @todo   Implement testRemove().
-     */
-    public function testRemove()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Tag::button_search
-     * @todo   Implement testButton_search().
-     */
-    public function testButton_search()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Tag::select_search
-     * @todo   Implement testSelect_search().
-     */
-    public function testSelect_search()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Tag::update_search_cell
-     * @todo   Implement testUpdate_search_cell().
-     */
-    public function testUpdate_search_cell()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-    /**
-     * @covers Tag::add_clear_button
-     * @todo   Implement testAdd_clear_button().
-     */
-    public function testAdd_clear_button()
-    {
-        // Remove the following lines when you implement this test.
-        $this->markTestIncomplete(
-                'This test has not been implemented yet.'
-        );
-    }
-
-}
diff --git a/unit-test/include/class_tag_sqlTest.php b/unit-test/include/class_tag_sqlTest.php
deleted file mode 100644
index fda9fcbdb..000000000
--- a/unit-test/include/class_tag_sqlTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-08 at 14:26:55.
- */
-class Tag_SQLTest extends PHPUnit_Framework_TestCase
-{
-
-    /**
-     * @var Tag_SQL
-     */
-    protected $object;
-
-    /**
-     * Sets up the fixture, for example, opens a network connection.
-     * This method is called before a test is executed.
-     */
-    protected function setUp()
-    {
-        $this->object=new Tag_SQL;
-    }
-
-    /**
-     * Tears down the fixture, for example, closes a network connection.
-     * This method is called after a test is executed.
-     */
-    protected function tearDown()
-    {
-        
-    }
-
-}
diff --git a/unit-test/include/class_databaseTest.php b/unit-test/include/lib/class_databaseTest.php
similarity index 93%
rename from unit-test/include/class_databaseTest.php
rename to unit-test/include/lib/class_databaseTest.php
index 1efb91b22..f25b1a6e6 100644
--- a/unit-test/include/class_databaseTest.php
+++ b/unit-test/include/lib/class_databaseTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Generated by PHPUnit_SkeletonGenerator on 2014-11-08 at 14:23:53.
+ * Generated by PHPUnit_SkeletonGenerator on 2016-02-11 at 15:41:40.
  */
 class DatabaseTest extends PHPUnit_Framework_TestCase
 {
@@ -29,6 +29,18 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
         
     }
 
+    /**
+     * @covers Database::connect
+     * @todo   Implement testConnect().
+     */
+    public function testConnect()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
     /**
      * @covers Database::verify
      * @todo   Implement testVerify().
@@ -233,6 +245,18 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
         );
     }
 
+    /**
+     * @covers Database::get_affected
+     * @todo   Implement testGet_affected().
+     */
+    public function testGet_affected()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
     /**
      * @covers Database::get_array
      * @todo   Implement testGet_array().
@@ -379,9 +403,21 @@ class DatabaseTest extends PHPUnit_Framework_TestCase
 
     /**
      * @covers Database::save_receipt
-     * @todo   Implement testsave_receipt().
+     * @todo   Implement testSave_receipt().
      */
-    public function testsave_receipt()
+    public function testSave_receipt()
+    {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @covers Database::upload
+     * @todo   Implement testUpload().
+     */
+    public function testUpload()
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(