diff --git a/bt5/erp5_egov/TestTemplateItem/testEGovMixin.py b/bt5/erp5_egov/TestTemplateItem/TestEGovMixin.py
similarity index 100%
rename from bt5/erp5_egov/TestTemplateItem/testEGovMixin.py
rename to bt5/erp5_egov/TestTemplateItem/TestEGovMixin.py
diff --git a/bt5/erp5_egov/bt/revision b/bt5/erp5_egov/bt/revision
index 64a0b71f19182e8b06f8eb147d6d6d7511786766..8c28da60d77512687b5c0d65184ab5a1bd077d06 100644
--- a/bt5/erp5_egov/bt/revision
+++ b/bt5/erp5_egov/bt/revision
@@ -1 +1 @@
-746
\ No newline at end of file
+747
\ No newline at end of file
diff --git a/bt5/erp5_egov/bt/template_test_id_list b/bt5/erp5_egov/bt/template_test_id_list
index 0693ab58456b295661902bc431153673fde075a2..ea29f506df21159fa6214d63ae7b99b7a361835c 100644
--- a/bt5/erp5_egov/bt/template_test_id_list
+++ b/bt5/erp5_egov/bt/template_test_id_list
@@ -1 +1 @@
-testEGovMixin
\ No newline at end of file
+TestEGovMixin
\ No newline at end of file
diff --git a/product/ERP5/tests/testInvoiceVAT.py b/product/ERP5Legacy/tests/_testInvoiceVAT.py
similarity index 99%
rename from product/ERP5/tests/testInvoiceVAT.py
rename to product/ERP5Legacy/tests/_testInvoiceVAT.py
index 047f95bb32dd19c36ae9ac83e22bfcd0fecbcd47..30cb657f8e6421c92afa1de7248b9027c23c7e56 100644
--- a/product/ERP5/tests/testInvoiceVAT.py
+++ b/product/ERP5Legacy/tests/_testInvoiceVAT.py
@@ -509,6 +509,6 @@ class TestInvoiceVAT(ERP5TypeTestCase):
 
 def test_suite():
   suite = unittest.TestSuite()
-  #suite.addTest(unittest.makeSuite(TestInvoiceVAT))
+  suite.addTest(unittest.makeSuite(TestInvoiceVAT))
   return suite
 
diff --git a/product/ERP5OOo/tests/testFormPrintout.py b/product/ERP5OOo/tests/TestFormPrintoutMixin.py
similarity index 100%
rename from product/ERP5OOo/tests/testFormPrintout.py
rename to product/ERP5OOo/tests/TestFormPrintoutMixin.py
diff --git a/product/ERP5OOo/tests/testFormPrintoutAsODG.py b/product/ERP5OOo/tests/testFormPrintoutAsODG.py
index d42a39dc187e335243792e163289219c270ee2e5..4a982f01dd6967a4efbf4dea80fec300709ed8e3 100644
--- a/product/ERP5OOo/tests/testFormPrintoutAsODG.py
+++ b/product/ERP5OOo/tests/testFormPrintoutAsODG.py
@@ -30,7 +30,7 @@
 import unittest
 import transaction
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
-from Products.ERP5OOo.tests.testFormPrintout import TestFormPrintoutMixin
+from Products.ERP5OOo.tests.TestFormPrintoutMixin import TestFormPrintoutMixin
 from Products.ERP5OOo.OOoUtils import OOoBuilder
 from Products.ERP5OOo.tests.utils import Validator
 from Products.ERP5Type.tests.utils import FileUpload
diff --git a/product/ERP5OOo/tests/testFormPrintoutAsODT.py b/product/ERP5OOo/tests/testFormPrintoutAsODT.py
index f3fb50c5b7796c1fd4ef9a0bfcaad2cdaa2c113d..6043a5c4c34757a504201956c0ef4bd52d75fe8e 100644
--- a/product/ERP5OOo/tests/testFormPrintoutAsODT.py
+++ b/product/ERP5OOo/tests/testFormPrintoutAsODT.py
@@ -33,7 +33,7 @@ import unittest
 import transaction
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
 from Products.ERP5Type.tests.backportUnittest import skip
-from Products.ERP5OOo.tests.testFormPrintout import TestFormPrintoutMixin
+from Products.ERP5OOo.tests.TestFormPrintoutMixin import TestFormPrintoutMixin
 from Products.ERP5Type.tests.utils import createZODBPythonScript
 from Products.MimetypesRegistry.mime_types.magic import guessMime
 from Products.ERP5OOo.OOoUtils import OOoBuilder