diff --git a/openerp/__init__.py b/openerp/__init__.py
index a06c85d0c21..995822c9cb0 100644
--- a/openerp/__init__.py
+++ b/openerp/__init__.py
@@ -19,17 +19,27 @@
 #
 ##############################################################################
 
-""" OpenERP core library..
-
-"""
-
-import sys
+""" OpenERP core library."""
 
+#----------------------------------------------------------
+# Running mode flags (gevent, prefork)
+#----------------------------------------------------------
 # Is the server running with gevent.
+import sys
 evented = False
 if sys.modules.get("gevent") is not None:
     evented = True
 
+# Is the server running in pefork mode (e.g. behind Gunicorn).
+# If this is True, the processes have to communicate some events,
+# e.g. database update or cache invalidation. Each process has also
+# its own copy of the data structure and we don't need to care about
+# locks between threads.
+multi_process = False
+
+#----------------------------------------------------------
+# libc UTC hack
+#----------------------------------------------------------
 # Make sure the OpenERP server runs in UTC. This is especially necessary
 # under Windows as under Linux it seems the real import of time is
 # sufficiently deferred so that setting the TZ environment variable
@@ -40,9 +50,22 @@ import time              # ... *then* import time.
 del os
 del time
 
+#----------------------------------------------------------
+# Shortcuts
+#----------------------------------------------------------
 # The hard-coded super-user id (a.k.a. administrator, or root user).
 SUPERUSER_ID = 1
 
+def registry(database_name):
+    """
+    Return the model registry for the given database. If the registry does not
+    exist yet, it is created on the fly.
+    """
+    return modules.registry.RegistryManager.get(database_name)
+
+#----------------------------------------------------------
+# Imports
+#----------------------------------------------------------
 import addons
 import cli
 import conf
@@ -58,23 +81,6 @@ import service
 import sql_db
 import tools
 import workflow
-# backward compatilbility
-# TODO: This is for the web addons, can be removed later.
-wsgi = service
-wsgi.register_wsgi_handler = wsgi.wsgi_server.register_wsgi_handler
-# Is the server running in multi-process mode (e.g. behind Gunicorn).
-# If this is True, the processes have to communicate some events,
-# e.g. database update or cache invalidation. Each process has also
-# its own copy of the data structure and we don't need to care about
-# locks between threads.
-multi_process = False
-
-def registry(database_name):
-    """
-    Return the model registry for the given database. If the registry does not
-    exist yet, it is created on the fly.
-    """
-    return modules.registry.RegistryManager.get(database_name)
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/addons/__init__.py b/openerp/addons/__init__.py
index 9554e9bd850..e040e19defd 100644
--- a/openerp/addons/__init__.py
+++ b/openerp/addons/__init__.py
@@ -34,7 +34,4 @@ Importing them from here is deprecated.
 
 """
 
-# get_module_path is used only by base_module_quality
-from openerp.modules import get_module_resource, get_module_path
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/__init__.py b/openerp/addons/base/__init__.py
index a5bc4c59484..26b39de74ad 100644
--- a/openerp/addons/base/__init__.py
+++ b/openerp/addons/base/__init__.py
@@ -25,6 +25,7 @@ import module
 import res
 import report
 import test
+import tests
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/openerp/addons/base/__openerp__.py b/openerp/addons/base/__openerp__.py
index 808dd18d3e5..3c3c290f986 100644
--- a/openerp/addons/base/__openerp__.py
+++ b/openerp/addons/base/__openerp__.py
@@ -92,8 +92,6 @@ The kernel of OpenERP, needed for all installation.
     ],
     'test': [
         'test/base_test.yml',
-        'test/test_context.xml',
-        'test/bug_lp541545.xml',
         'test/test_osv_expression.yml',
         'test/test_ir_rule.yml', # <-- These tests modify/add/delete ir_rules.
     ],
diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py
index c1e9bbe50d8..e7fa064e33a 100644
--- a/openerp/addons/base/ir/ir_actions.py
+++ b/openerp/addons/base/ir/ir_actions.py
@@ -910,6 +910,29 @@ class ir_actions_server(osv.osv):
         if action.link_new_record and action.link_field_id:
             self.pool[action.model_id.model].write(cr, uid, [context.get('active_id')], {action.link_field_id.name: res_id})
 
+    def _get_eval_context(self, cr, uid, action, context=None):
+        """ Prepare the context used when evaluating python code, like the
+        condition or code server actions.
+
+        :param action: the current server action
+        :type action: browse record
+        :returns: dict -- evaluation context given to (safe_)eval """
+        user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
+        obj_pool = self.pool[action.model_id.model]
+        obj = None
+        if context.get('active_model') == action.model_id.model and context.get('active_id'):
+            obj = obj_pool.browse(cr, uid, context['active_id'], context=context)
+        return {
+            'self': obj_pool,
+            'object': obj,
+            'obj': obj,
+            'pool': self.pool,
+            'time': time,
+            'cr': cr,
+            'uid': uid,
+            'user': user,
+        }
+
     def run(self, cr, uid, ids, context=None):
         """ Runs the server action. For each server action, the condition is
         checked. Note that a void (``False``) condition is considered as always
@@ -932,25 +955,9 @@ class ir_actions_server(osv.osv):
         if context is None:
             context = {}
         res = False
-        user = self.pool.get('res.users').browse(cr, uid, uid)
         active_ids = context.get('active_ids', [context.get('active_id')])
         for action in self.browse(cr, uid, ids, context):
-            obj_pool = self.pool[action.model_id.model]
-            obj = None
-            if context.get('active_model') == action.model_id.model and context.get('active_id'):
-                obj = obj_pool.browse(cr, uid, context['active_id'], context=context)
-
-            # evaluation context for python strings to evaluate
-            eval_context = {
-                'self': obj_pool,
-                'object': obj,
-                'obj': obj,
-                'pool': self.pool,
-                'time': time,
-                'cr': cr,
-                'uid': uid,
-                'user': user,
-            }
+            eval_context = self._get_eval_context(cr, uid, action, context=context)
             condition = action.condition
             if condition is False:
                 # Void (aka False) conditions are considered as True
diff --git a/openerp/addons/base/ir/ir_fields.py b/openerp/addons/base/ir/ir_fields.py
index f238bf78719..217ea319d8e 100644
--- a/openerp/addons/base/ir/ir_fields.py
+++ b/openerp/addons/base/ir/ir_fields.py
@@ -13,6 +13,7 @@ from openerp.osv import orm
 from openerp.tools.translate import _
 from openerp.tools.misc import DEFAULT_SERVER_DATE_FORMAT,\
                                DEFAULT_SERVER_DATETIME_FORMAT
+from openerp.tools import html_sanitize
 
 REFERENCING_FIELDS = set([None, 'id', '.id'])
 def only_ref_fields(record):
@@ -188,7 +189,7 @@ class ir_fields_converter(orm.Model):
 
     def _str_id(self, cr, uid, model, column, value, context=None):
         return value, []
-    _str_to_reference = _str_to_char = _str_to_text = _str_to_binary = _str_id
+    _str_to_reference = _str_to_char = _str_to_text = _str_to_binary = _str_to_html = _str_id
 
     def _str_to_date(self, cr, uid, model, column, value, context=None):
         try:
diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index 8ea46bcfa4d..011ba2dc792 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -337,7 +337,7 @@ class view(osv.osv):
             if isinstance(spec, SKIPPED_ELEMENT_TYPES):
                 continue
             if spec.tag == 'data':
-                specs += [ c for c in specs_tree ]
+                specs += [c for c in spec]
                 continue
             node = self.locate_node(source, spec)
             if node is not None:
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 822c6a36fd2..a0e32ab83bd 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -129,7 +129,7 @@
                 <form string="Partners" version="7.0">
                 <sheet>
                     <field name="image" widget='image' class="oe_left oe_avatar" options='{"preview_image": "image_medium", "size": [90, 90]}'/>
-                    <div class="oe_title">
+                    <div class="oe_title oe_left">
                         <div class="oe_edit_only">
                             <label for="name"/> (
                             <field name="is_company" on_change="onchange_type(is_company)" class="oe_inline"/> <label for="is_company" string="Is a Company?"/>)
diff --git a/openerp/addons/base/test/bug_lp541545.xml b/openerp/addons/base/test/bug_lp541545.xml
deleted file mode 100644
index 79c3c05c729..00000000000
--- a/openerp/addons/base/test/bug_lp541545.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-   <!-- Test count attribute for assertions -->
-   <data>
-       <assert
-               model="res.currency.rate"
-               search="[('currency_id', '=', ref('INR'))]"
-               count="1"
-               string="Rate entries for Indian rupee">
-               <test expr="True"/>
-       </assert>
-   </data>
-    
-</openerp>
diff --git a/openerp/addons/base/test/test_context.xml b/openerp/addons/base/test/test_context.xml
deleted file mode 100644
index d308fc3dea8..00000000000
--- a/openerp/addons/base/test/test_context.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <!-- Test context attribute for unit tests -->
-    <data context="{'date': '2009-06-01'}">
-<!--        <assert -->
-<!--            model="res.currency"-->
-<!--            id="INR"-->
-<!--            string="Indian rupee rate in 2009">-->
-            <!-- date specified in data element's context -->
-<!--            <test expr="str(rate)">65.8287</test>-->
-<!--        </assert> -->
-        <assert
-            model="res.currency"
-            id="INR"
-            string="Indian rupee rate in 2002"
-            context="{'date': '2010-06-01'}">
-            <test expr="rate_ids and str(rate_ids[0].rate)">59.9739</test>
-        </assert>
-    </data>
-</openerp>
diff --git a/openerp/addons/base/tests/__init__.py b/openerp/addons/base/tests/__init__.py
index 0306839b5d3..6358dffa45b 100644
--- a/openerp/addons/base/tests/__init__.py
+++ b/openerp/addons/base/tests/__init__.py
@@ -1,23 +1,27 @@
+import test_acl
 import test_base
+import test_basecase
+import test_db_cursor
 import test_expression
+import test_expression
+import test_fields
+import test_func
 import test_ir_actions
 import test_ir_attachment
+import test_ir_filters
+import test_ir_sequence
 import test_ir_values
+import test_mail
 import test_menu
+import test_orm
+import test_osv
+import test_qweb
 import test_res_config
 import test_res_lang
 import test_search
+import test_translate
+import test_ui
+#import test_uninstall
+import test_view_validation
 import test_views
-
-checks = [
-    test_base,
-    test_expression,
-    test_ir_actions,
-    test_ir_attachment,
-    test_ir_values,
-    test_menu,
-    test_res_config,
-    test_res_lang,
-    test_search,
-    test_views,
-]
+import test_xmlrpc
diff --git a/openerp/tests/test_acl.py b/openerp/addons/base/tests/test_acl.py
similarity index 99%
rename from openerp/tests/test_acl.py
rename to openerp/addons/base/tests/test_acl.py
index 798561c47bf..f3fa0bb2b1d 100644
--- a/openerp/tests/test_acl.py
+++ b/openerp/addons/base/tests/test_acl.py
@@ -3,8 +3,7 @@ from lxml import etree
 
 import openerp
 from openerp.tools.misc import mute_logger
-
-import common
+from openerp.tests import common
 
 # test group that demo user should not have
 GROUP_TECHNICAL_FEATURES = 'base.group_no_one'
diff --git a/openerp/addons/base/tests/test_base.py b/openerp/addons/base/tests/test_base.py
index 9b6ec4708ac..20382737529 100644
--- a/openerp/addons/base/tests/test_base.py
+++ b/openerp/addons/base/tests/test_base.py
@@ -8,6 +8,7 @@ class test_base(common.TransactionCase):
     def setUp(self):
         super(test_base,self).setUp()
         self.res_partner = self.registry('res.partner')
+        self.res_users = self.registry('res.users')
 
         # samples use effective TLDs from the Mozilla public suffix
         # list at http://publicsuffix.org
@@ -282,6 +283,21 @@ class test_base(common.TransactionCase):
         p0.refresh()
         self.assertEquals(p0.vat, sunhelmvat2, 'Commercial fields must be automatically synced')
 
+    def test_60_read_group(self):
+        cr, uid = self.cr, self.uid
+        for user_data in [
+          {'name': 'Alice', 'login': 'alice', 'color': 1, 'function': 'Friend'},
+          {'name': 'Bob', 'login': 'bob', 'color': 2, 'function': 'Friend'},
+          {'name': 'Eve', 'login': 'eve', 'color': 3, 'function': 'Eavesdropper'},
+        ]:
+          self.res_users.create(cr, uid, user_data)
+
+        groups_data = self.res_users.read_group(cr, uid, domain=[('login', 'in', ('alice', 'bob', 'eve'))], fields=['name', 'color', 'function'], groupby='function')
+        self.assertEqual(len(groups_data), 2, "Incorrect number of results when grouping on a field")
+        for group_data in groups_data:
+          self.assertIn('color', group_data, "Aggregated data for the column 'color' is not present in read_group return values")
+          self.assertEqual(group_data['color'], 3, "Incorrect sum for aggregated data for the column 'color'")
+
 class test_partner_recursion(common.TransactionCase):
 
     def setUp(self):
diff --git a/openerp/tests/test_basecase.py b/openerp/addons/base/tests/test_basecase.py
similarity index 99%
rename from openerp/tests/test_basecase.py
rename to openerp/addons/base/tests/test_basecase.py
index 376494b571e..8b06eff7858 100644
--- a/openerp/tests/test_basecase.py
+++ b/openerp/addons/base/tests/test_basecase.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import unittest2
 
-import common
+from openerp.tests import common
 
 class test_single_transaction_case(common.SingleTransactionCase):
     """
diff --git a/openerp/tests/test_db_cursor.py b/openerp/addons/base/tests/test_db_cursor.py
similarity index 96%
rename from openerp/tests/test_db_cursor.py
rename to openerp/addons/base/tests/test_db_cursor.py
index dba1cf47b64..b3ce36467bb 100644
--- a/openerp/tests/test_db_cursor.py
+++ b/openerp/addons/base/tests/test_db_cursor.py
@@ -4,7 +4,7 @@ import unittest2
 
 import openerp
 from openerp.tools.misc import mute_logger
-import common
+from openerp.tests import common
 
 DB = common.DB
 ADMIN_USER_ID = common.ADMIN_USER_ID
diff --git a/openerp/addons/base/tests/test_expression.py b/openerp/addons/base/tests/test_expression.py
index 4f533a5e170..a05009b0252 100644
--- a/openerp/addons/base/tests/test_expression.py
+++ b/openerp/addons/base/tests/test_expression.py
@@ -1,8 +1,9 @@
 import unittest2
+
+import openerp
 from openerp.osv.orm import BaseModel
 import openerp.tests.common as common
 
-
 class test_expression(common.TransactionCase):
 
     def _reinit_mock(self):
@@ -439,5 +440,13 @@ class test_expression(common.TransactionCase):
         partner_parent_id_col._auto_join = False
         state_country_id_col._auto_join = False
 
+    def test_30_normalize_domain(self):
+        expression = openerp.osv.expression
+        norm_domain = domain = ['&', (1, '=', 1), ('a', '=', 'b')]
+        assert norm_domain == expression.normalize_domain(domain), "Normalized domains should be left untouched"
+        domain = [('x', 'in', ['y', 'z']), ('a.v', '=', 'e'), '|', '|', ('a', '=', 'b'), '!', ('c', '>', 'd'), ('e', '!=', 'f'), ('g', '=', 'h')]
+        norm_domain = ['&', '&', '&'] + domain
+        assert norm_domain == expression.normalize_domain(domain), "Non-normalized domains should be properly normalized"
+
 if __name__ == '__main__':
     unittest2.main()
diff --git a/openerp/tests/test_fields.py b/openerp/addons/base/tests/test_fields.py
similarity index 99%
rename from openerp/tests/test_fields.py
rename to openerp/addons/base/tests/test_fields.py
index 774bbf41fb2..6dd016ccaf9 100644
--- a/openerp/tests/test_fields.py
+++ b/openerp/addons/base/tests/test_fields.py
@@ -1,9 +1,8 @@
 #
 # test cases for fields access, etc.
 #
-import common
-
 from openerp.osv import fields
+from openerp.tests import common
 
 class TestRelatedField(common.TransactionCase):
 
diff --git a/openerp/tests/test_func.py b/openerp/addons/base/tests/test_func.py
similarity index 92%
rename from openerp/tests/test_func.py
rename to openerp/addons/base/tests/test_func.py
index 7bb2e8fdf07..e6dfab20825 100644
--- a/openerp/tests/test_func.py
+++ b/openerp/addons/base/tests/test_func.py
@@ -2,7 +2,7 @@
 import functools
 import unittest2
 
-from ..tools.func import compose
+from openerp.tools.func import compose
 
 class TestCompose(unittest2.TestCase):
     def test_basic(self):
diff --git a/openerp/tests/test_ir_filters.py b/openerp/addons/base/tests/test_ir_filters.py
similarity index 99%
rename from openerp/tests/test_ir_filters.py
rename to openerp/addons/base/tests/test_ir_filters.py
index 64d5c9820d3..04ecca74525 100644
--- a/openerp/tests/test_ir_filters.py
+++ b/openerp/addons/base/tests/test_ir_filters.py
@@ -2,7 +2,7 @@
 import functools
 
 from openerp import exceptions
-from . import common
+from openerp.tests import common
 
 def noid(d):
     """ Removes `id` key from a dict so we don't have to keep these things
diff --git a/openerp/tests/test_ir_sequence.py b/openerp/addons/base/tests/test_ir_sequence.py
similarity index 99%
rename from openerp/tests/test_ir_sequence.py
rename to openerp/addons/base/tests/test_ir_sequence.py
index cbb1a347038..bc428d7f647 100644
--- a/openerp/tests/test_ir_sequence.py
+++ b/openerp/addons/base/tests/test_ir_sequence.py
@@ -11,7 +11,7 @@ import psycopg2
 import unittest2
 
 import openerp
-import common
+from openerp.tests import common
 
 DB = common.DB
 ADMIN_USER_ID = common.ADMIN_USER_ID
diff --git a/openerp/tests/test_mail.py b/openerp/addons/base/tests/test_mail.py
old mode 100755
new mode 100644
similarity index 99%
rename from openerp/tests/test_mail.py
rename to openerp/addons/base/tests/test_mail.py
index d99a95afbe8..4ebec837c6d
--- a/openerp/tests/test_mail.py
+++ b/openerp/addons/base/tests/test_mail.py
@@ -26,9 +26,10 @@ import unittest2
 
 from lxml import etree
 
-from openerp.tests import test_mail_examples
 from openerp.tools import html_sanitize, html_email_clean, append_content_to_html, plaintext2html, email_split
 
+import test_mail_examples
+
 
 class TestSanitizer(unittest2.TestCase):
     """ Test the html sanitizer that filters html to remove unwanted attributes """
diff --git a/openerp/tests/test_mail_examples.py b/openerp/addons/base/tests/test_mail_examples.py
similarity index 100%
rename from openerp/tests/test_mail_examples.py
rename to openerp/addons/base/tests/test_mail_examples.py
diff --git a/openerp/tests/test_misc.py b/openerp/addons/base/tests/test_misc.py
similarity index 84%
rename from openerp/tests/test_misc.py
rename to openerp/addons/base/tests/test_misc.py
index 865b51df660..11cc3f49638 100644
--- a/openerp/tests/test_misc.py
+++ b/openerp/addons/base/tests/test_misc.py
@@ -1,13 +1,6 @@
-# This test can be run stand-alone with something like:
-# > PYTHONPATH=. python2 openerp/tests/test_misc.py
-import datetime
-import locale
 import unittest2
 
-import babel
-import babel.dates
-
-from ..tools import misc
+from openerp.tools import misc
 
 
 class test_countingstream(unittest2.TestCase):
diff --git a/openerp/tests/test_orm.py b/openerp/addons/base/tests/test_orm.py
similarity index 99%
rename from openerp/tests/test_orm.py
rename to openerp/addons/base/tests/test_orm.py
index b85a0e26adb..fcd81965b8c 100644
--- a/openerp/tests/test_orm.py
+++ b/openerp/addons/base/tests/test_orm.py
@@ -1,6 +1,6 @@
 from collections import defaultdict
 from openerp.tools import mute_logger
-import common
+from openerp.tests import common
 
 UID = common.ADMIN_USER_ID
 DB = common.DB
diff --git a/openerp/tests/test_osv.py b/openerp/addons/base/tests/test_osv.py
similarity index 100%
rename from openerp/tests/test_osv.py
rename to openerp/addons/base/tests/test_osv.py
diff --git a/openerp/tests/test_qweb.py b/openerp/addons/base/tests/test_qweb.py
similarity index 98%
rename from openerp/tests/test_qweb.py
rename to openerp/addons/base/tests/test_qweb.py
index 48e8dc377c5..71beaab605a 100644
--- a/openerp/tests/test_qweb.py
+++ b/openerp/addons/base/tests/test_qweb.py
@@ -2,7 +2,7 @@
 import cgi
 from xml.dom import minidom as dom
 
-import common
+from openerp.tests import common
 from openerp.addons.base.ir import ir_qweb
 
 impl = dom.getDOMImplementation()
diff --git a/openerp/tests/test_translate.py b/openerp/addons/base/tests/test_translate.py
similarity index 100%
rename from openerp/tests/test_translate.py
rename to openerp/addons/base/tests/test_translate.py
diff --git a/openerp/addons/base/tests/test_ui.py b/openerp/addons/base/tests/test_ui.py
new file mode 100644
index 00000000000..63136b36a31
--- /dev/null
+++ b/openerp/addons/base/tests/test_ui.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+import os
+
+import openerp
+
+class TestUi(openerp.tests.HttpCase):
+    def test_js(self):
+        self.phantom_js('/',"console.log('ok')","console", login=None)
+
+    def test_jsfile(self):
+        self.phantom_jsfile(os.path.join(os.path.dirname(__file__), 'test_ui_hello.js'))
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/addons/base/tests/test_ui_hello.js b/openerp/addons/base/tests/test_ui_hello.js
new file mode 100644
index 00000000000..6a453e947aa
--- /dev/null
+++ b/openerp/addons/base/tests/test_ui_hello.js
@@ -0,0 +1,5 @@
+console.log("hello from test_phantom_hello.js");
+console.log("ok");
+// For a failure use:
+//console.log("error");
+phantom.exit();
diff --git a/openerp/addons/base/tests/test_uninstall.py b/openerp/addons/base/tests/test_uninstall.py
new file mode 100644
index 00000000000..2425249afa4
--- /dev/null
+++ b/openerp/addons/base/tests/test_uninstall.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+# This assumes an existing but uninitialized database.
+import unittest2
+
+import openerp
+from openerp import SUPERUSER_ID
+import common
+
+DB = common.DB
+ADMIN_USER_ID = common.ADMIN_USER_ID
+
+def registry(model):
+    return openerp.modules.registry.RegistryManager.get(DB)[model]
+
+def cursor():
+    return openerp.modules.registry.RegistryManager.get(DB).db.cursor()
+
+def get_module(module_name):
+    registry = openerp.modules.registry.RegistryManager.get(DB)
+    return registry.get(module_name)
+
+def reload_registry():
+    openerp.modules.registry.RegistryManager.new(
+        DB, update_module=True)
+
+def search_registry(model_name, domain):
+    cr = cursor()
+    model = registry(model_name)
+    record_ids = model.search(cr, SUPERUSER_ID, domain, {})
+    cr.close()
+    return record_ids
+
+def install_module(module_name):
+    ir_module_module = registry('ir.module.module')
+    cr = cursor()
+    module_ids = ir_module_module.search(cr, SUPERUSER_ID,
+        [('name', '=', module_name)], {})
+    assert len(module_ids) == 1
+    ir_module_module.button_install(cr, SUPERUSER_ID, module_ids, {})
+    cr.commit()
+    cr.close()
+    reload_registry()
+
+def uninstall_module(module_name):
+    ir_module_module = registry('ir.module.module')
+    cr = cursor()
+    module_ids = ir_module_module.search(cr, SUPERUSER_ID,
+        [('name', '=', module_name)], {})
+    assert len(module_ids) == 1
+    ir_module_module.button_uninstall(cr, SUPERUSER_ID, module_ids, {})
+    cr.commit()
+    cr.close()
+    reload_registry()
+
+class test_uninstall(unittest2.TestCase):
+    """
+    Test the install/uninstall of a test module. The module is available in
+    `openerp.tests` which should be present in the addons-path.
+    """
+
+    def test_01_install(self):
+        """ Check a few things showing the module is installed. """
+        install_module('test_uninstall')
+        assert get_module('test_uninstall.model')
+
+        assert search_registry('ir.model.data',
+            [('module', '=', 'test_uninstall')])
+
+        assert search_registry('ir.model.fields',
+            [('model', '=', 'test_uninstall.model')])
+
+    def test_02_uninstall(self):
+        """ Check a few things showing the module is uninstalled. """
+        uninstall_module('test_uninstall')
+        assert not get_module('test_uninstall.model')
+
+        assert not search_registry('ir.model.data',
+            [('module', '=', 'test_uninstall')])
+
+        assert not search_registry('ir.model.fields',
+            [('model', '=', 'test_uninstall.model')])
+
+
+
+if __name__ == '__main__':
+    unittest2.main()
+
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tests/test_view_validation.py b/openerp/addons/base/tests/test_view_validation.py
similarity index 100%
rename from openerp/tests/test_view_validation.py
rename to openerp/addons/base/tests/test_view_validation.py
diff --git a/openerp/addons/base/tests/test_xmlrpc.py b/openerp/addons/base/tests/test_xmlrpc.py
new file mode 100644
index 00000000000..ab1d3821c40
--- /dev/null
+++ b/openerp/addons/base/tests/test_xmlrpc.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+import time
+import unittest2
+import xmlrpclib
+
+from openerp.tests import common
+
+DB = common.DB
+ADMIN_USER = common.ADMIN_USER
+ADMIN_USER_ID = common.ADMIN_USER_ID
+ADMIN_PASSWORD = common.ADMIN_PASSWORD
+
+class test_xmlrpc(common.HttpCase):
+
+    def test_01_xmlrpc_login(self):
+        """ Try to login on the common service. """
+        uid = self.xmlrpc_common.login(DB, ADMIN_USER, ADMIN_PASSWORD)
+        self.assertTrue(uid == ADMIN_USER_ID)
+
+    def test_xmlrpc_ir_model_search(self):
+        """ Try a search on the object service. """
+        o = self.xmlrpc_object
+        ids = o.execute(DB, ADMIN_USER_ID, ADMIN_PASSWORD, 'ir.model', 'search', [])
+        self.assertIsInstance(ids, list)
+        ids = o.execute(DB, ADMIN_USER_ID, ADMIN_PASSWORD, 'ir.model', 'search', [], {})
+        self.assertIsInstance(ids, list)
+
+    # This test was written to test the creation of a new RPC endpoint, not
+    # really for the EDI itself.
+    #def test_xmlrpc_import_edi_document(self):
+    #    """ Try to call an EDI method. """
+    #    msg_re = 'EDI Document is empty!'
+    #    with self.assertRaisesRegexp(Exception, msg_re):
+    #        self.proxy.edi_60.import_edi_document(DB, ADMIN_USER_ID, ADMIN_PASSWORD, {})
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tests/addons/test_convert/__init__.py b/openerp/addons/test_convert/__init__.py
similarity index 100%
rename from openerp/tests/addons/test_convert/__init__.py
rename to openerp/addons/test_convert/__init__.py
diff --git a/openerp/tests/addons/test_convert/__openerp__.py b/openerp/addons/test_convert/__openerp__.py
similarity index 100%
rename from openerp/tests/addons/test_convert/__openerp__.py
rename to openerp/addons/test_convert/__openerp__.py
diff --git a/openerp/tests/addons/test_convert/test_file.txt b/openerp/addons/test_convert/test_file.txt
similarity index 100%
rename from openerp/tests/addons/test_convert/test_file.txt
rename to openerp/addons/test_convert/test_file.txt
diff --git a/openerp/tests/addons/test_convert/tests/__init__.py b/openerp/addons/test_convert/tests/__init__.py
similarity index 100%
rename from openerp/tests/addons/test_convert/tests/__init__.py
rename to openerp/addons/test_convert/tests/__init__.py
diff --git a/openerp/tests/addons/test_convert/tests/test_convert.py b/openerp/addons/test_convert/tests/test_convert.py
similarity index 100%
rename from openerp/tests/addons/test_convert/tests/test_convert.py
rename to openerp/addons/test_convert/tests/test_convert.py
diff --git a/openerp/tests/addons/test_converter/__init__.py b/openerp/addons/test_converter/__init__.py
similarity index 100%
rename from openerp/tests/addons/test_converter/__init__.py
rename to openerp/addons/test_converter/__init__.py
diff --git a/openerp/tests/addons/test_converter/__openerp__.py b/openerp/addons/test_converter/__openerp__.py
similarity index 100%
rename from openerp/tests/addons/test_converter/__openerp__.py
rename to openerp/addons/test_converter/__openerp__.py
diff --git a/openerp/tests/addons/test_converter/ir.model.access.csv b/openerp/addons/test_converter/ir.model.access.csv
similarity index 100%
rename from openerp/tests/addons/test_converter/ir.model.access.csv
rename to openerp/addons/test_converter/ir.model.access.csv
diff --git a/openerp/tests/addons/test_converter/models.py b/openerp/addons/test_converter/models.py
similarity index 100%
rename from openerp/tests/addons/test_converter/models.py
rename to openerp/addons/test_converter/models.py
diff --git a/openerp/tests/addons/test_converter/tests/__init__.py b/openerp/addons/test_converter/tests/__init__.py
similarity index 100%
rename from openerp/tests/addons/test_converter/tests/__init__.py
rename to openerp/addons/test_converter/tests/__init__.py
diff --git a/openerp/tests/addons/test_converter/tests/test_html.py b/openerp/addons/test_converter/tests/test_html.py
similarity index 100%
rename from openerp/tests/addons/test_converter/tests/test_html.py
rename to openerp/addons/test_converter/tests/test_html.py
diff --git a/openerp/tests/addons/test_converter/tests/test_vectors/image b/openerp/addons/test_converter/tests/test_vectors/image
similarity index 100%
rename from openerp/tests/addons/test_converter/tests/test_vectors/image
rename to openerp/addons/test_converter/tests/test_vectors/image
diff --git a/openerp/tests/addons/test_converter/tests/test_vectors/pdf b/openerp/addons/test_converter/tests/test_vectors/pdf
similarity index 100%
rename from openerp/tests/addons/test_converter/tests/test_vectors/pdf
rename to openerp/addons/test_converter/tests/test_vectors/pdf
diff --git a/openerp/tests/addons/test_converter/tests/test_vectors/pptx b/openerp/addons/test_converter/tests/test_vectors/pptx
similarity index 100%
rename from openerp/tests/addons/test_converter/tests/test_vectors/pptx
rename to openerp/addons/test_converter/tests/test_vectors/pptx
diff --git a/openerp/tests/addons/test_exceptions/__init__.py b/openerp/addons/test_exceptions/__init__.py
similarity index 100%
rename from openerp/tests/addons/test_exceptions/__init__.py
rename to openerp/addons/test_exceptions/__init__.py
diff --git a/openerp/tests/addons/test_exceptions/__openerp__.py b/openerp/addons/test_exceptions/__openerp__.py
similarity index 100%
rename from openerp/tests/addons/test_exceptions/__openerp__.py
rename to openerp/addons/test_exceptions/__openerp__.py
diff --git a/openerp/tests/addons/test_exceptions/ir.model.access.csv b/openerp/addons/test_exceptions/ir.model.access.csv
similarity index 100%
rename from openerp/tests/addons/test_exceptions/ir.model.access.csv
rename to openerp/addons/test_exceptions/ir.model.access.csv
diff --git a/openerp/tests/addons/test_exceptions/models.py b/openerp/addons/test_exceptions/models.py
similarity index 100%
rename from openerp/tests/addons/test_exceptions/models.py
rename to openerp/addons/test_exceptions/models.py
diff --git a/openerp/tests/addons/test_exceptions/view.xml b/openerp/addons/test_exceptions/view.xml
similarity index 100%
rename from openerp/tests/addons/test_exceptions/view.xml
rename to openerp/addons/test_exceptions/view.xml
diff --git a/openerp/tests/addons/test_impex/__init__.py b/openerp/addons/test_impex/__init__.py
similarity index 100%
rename from openerp/tests/addons/test_impex/__init__.py
rename to openerp/addons/test_impex/__init__.py
diff --git a/openerp/tests/addons/test_impex/__openerp__.py b/openerp/addons/test_impex/__openerp__.py
similarity index 100%
rename from openerp/tests/addons/test_impex/__openerp__.py
rename to openerp/addons/test_impex/__openerp__.py
diff --git a/openerp/tests/addons/test_impex/ir.model.access.csv b/openerp/addons/test_impex/ir.model.access.csv
similarity index 100%
rename from openerp/tests/addons/test_impex/ir.model.access.csv
rename to openerp/addons/test_impex/ir.model.access.csv
diff --git a/openerp/tests/addons/test_impex/models.py b/openerp/addons/test_impex/models.py
similarity index 100%
rename from openerp/tests/addons/test_impex/models.py
rename to openerp/addons/test_impex/models.py
diff --git a/openerp/tests/addons/test_impex/tests/__init__.py b/openerp/addons/test_impex/tests/__init__.py
similarity index 100%
rename from openerp/tests/addons/test_impex/tests/__init__.py
rename to openerp/addons/test_impex/tests/__init__.py
diff --git a/openerp/tests/addons/test_impex/tests/contacts.json b/openerp/addons/test_impex/tests/contacts.json
similarity index 100%
rename from openerp/tests/addons/test_impex/tests/contacts.json
rename to openerp/addons/test_impex/tests/contacts.json
diff --git a/openerp/tests/addons/test_impex/tests/contacts_big.json b/openerp/addons/test_impex/tests/contacts_big.json
similarity index 100%
rename from openerp/tests/addons/test_impex/tests/contacts_big.json
rename to openerp/addons/test_impex/tests/contacts_big.json
diff --git a/openerp/tests/addons/test_impex/tests/test_export.py b/openerp/addons/test_impex/tests/test_export.py
similarity index 100%
rename from openerp/tests/addons/test_impex/tests/test_export.py
rename to openerp/addons/test_impex/tests/test_export.py
diff --git a/openerp/tests/addons/test_impex/tests/test_import.py b/openerp/addons/test_impex/tests/test_import.py
similarity index 100%
rename from openerp/tests/addons/test_impex/tests/test_import.py
rename to openerp/addons/test_impex/tests/test_import.py
diff --git a/openerp/tests/addons/test_impex/tests/test_load.py b/openerp/addons/test_impex/tests/test_load.py
similarity index 100%
rename from openerp/tests/addons/test_impex/tests/test_load.py
rename to openerp/addons/test_impex/tests/test_load.py
diff --git a/openerp/tests/addons/test_limits/__init__.py b/openerp/addons/test_limits/__init__.py
similarity index 100%
rename from openerp/tests/addons/test_limits/__init__.py
rename to openerp/addons/test_limits/__init__.py
diff --git a/openerp/tests/addons/test_limits/__openerp__.py b/openerp/addons/test_limits/__openerp__.py
similarity index 100%
rename from openerp/tests/addons/test_limits/__openerp__.py
rename to openerp/addons/test_limits/__openerp__.py
diff --git a/openerp/tests/addons/test_limits/ir.model.access.csv b/openerp/addons/test_limits/ir.model.access.csv
similarity index 100%
rename from openerp/tests/addons/test_limits/ir.model.access.csv
rename to openerp/addons/test_limits/ir.model.access.csv
diff --git a/openerp/tests/addons/test_limits/models.py b/openerp/addons/test_limits/models.py
similarity index 100%
rename from openerp/tests/addons/test_limits/models.py
rename to openerp/addons/test_limits/models.py
diff --git a/openerp/tests/addons/test_uninstall/__init__.py b/openerp/addons/test_uninstall/__init__.py
similarity index 100%
rename from openerp/tests/addons/test_uninstall/__init__.py
rename to openerp/addons/test_uninstall/__init__.py
diff --git a/openerp/tests/addons/test_uninstall/__openerp__.py b/openerp/addons/test_uninstall/__openerp__.py
similarity index 100%
rename from openerp/tests/addons/test_uninstall/__openerp__.py
rename to openerp/addons/test_uninstall/__openerp__.py
diff --git a/openerp/tests/addons/test_uninstall/ir.model.access.csv b/openerp/addons/test_uninstall/ir.model.access.csv
similarity index 100%
rename from openerp/tests/addons/test_uninstall/ir.model.access.csv
rename to openerp/addons/test_uninstall/ir.model.access.csv
diff --git a/openerp/tests/addons/test_uninstall/models.py b/openerp/addons/test_uninstall/models.py
similarity index 100%
rename from openerp/tests/addons/test_uninstall/models.py
rename to openerp/addons/test_uninstall/models.py
diff --git a/openerp/tests/addons/test_workflow/__init__.py b/openerp/addons/test_workflow/__init__.py
similarity index 100%
rename from openerp/tests/addons/test_workflow/__init__.py
rename to openerp/addons/test_workflow/__init__.py
diff --git a/openerp/tests/addons/test_workflow/__openerp__.py b/openerp/addons/test_workflow/__openerp__.py
similarity index 100%
rename from openerp/tests/addons/test_workflow/__openerp__.py
rename to openerp/addons/test_workflow/__openerp__.py
diff --git a/openerp/tests/addons/test_workflow/data.xml b/openerp/addons/test_workflow/data.xml
similarity index 100%
rename from openerp/tests/addons/test_workflow/data.xml
rename to openerp/addons/test_workflow/data.xml
diff --git a/openerp/tests/addons/test_workflow/ir.model.access.csv b/openerp/addons/test_workflow/ir.model.access.csv
similarity index 100%
rename from openerp/tests/addons/test_workflow/ir.model.access.csv
rename to openerp/addons/test_workflow/ir.model.access.csv
diff --git a/openerp/tests/addons/test_workflow/models.py b/openerp/addons/test_workflow/models.py
similarity index 100%
rename from openerp/tests/addons/test_workflow/models.py
rename to openerp/addons/test_workflow/models.py
diff --git a/openerp/tests/addons/test_workflow/tests/__init__.py b/openerp/addons/test_workflow/tests/__init__.py
similarity index 100%
rename from openerp/tests/addons/test_workflow/tests/__init__.py
rename to openerp/addons/test_workflow/tests/__init__.py
diff --git a/openerp/tests/addons/test_workflow/tests/test_workflow.py b/openerp/addons/test_workflow/tests/test_workflow.py
similarity index 100%
rename from openerp/tests/addons/test_workflow/tests/test_workflow.py
rename to openerp/addons/test_workflow/tests/test_workflow.py
diff --git a/openerp/cli/server.py b/openerp/cli/server.py
index ee2e90bccbd..004cb1ab8bb 100644
--- a/openerp/cli/server.py
+++ b/openerp/cli/server.py
@@ -89,29 +89,6 @@ def setup_pid_file():
             pidtext = "%d" % (os.getpid())
             fd.write(pidtext)
 
-def preload_registry(dbname):
-    """ Preload a registry, and start the cron."""
-    try:
-        update_module = True if openerp.tools.config['init'] or openerp.tools.config['update'] else False
-        registry = openerp.modules.registry.RegistryManager.new(dbname, update_module=update_module)
-    except Exception:
-        _logger.exception('Failed to initialize database `%s`.', dbname)
-        return False
-    return registry._assertion_report.failures == 0
-
-def run_test_file(dbname, test_file):
-    """ Preload a registry, possibly run a test file, and start the cron."""
-    try:
-        config = openerp.tools.config
-        registry = openerp.modules.registry.RegistryManager.new(dbname, update_module=config['init'] or config['update'])
-        cr = registry.db.cursor()
-        _logger.info('loading test file %s', test_file)
-        openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
-        cr.rollback()
-        cr.close()
-    except Exception:
-        _logger.exception('Failed to initialize database `%s` and run test file `%s`.', dbname, test_file)
-
 def export_translation():
     config = openerp.tools.config
     dbname = config['db_name']
@@ -156,8 +133,7 @@ def main(args):
     config = openerp.tools.config
 
     if config["test_file"]:
-        run_test_file(config['db_name'], config['test_file'])
-        sys.exit(0)
+        config["test_enable"] = True
 
     if config["translate_out"]:
         export_translation()
@@ -172,23 +148,17 @@ def main(args):
     if config['workers']:
         openerp.multi_process = True
 
-    # preload registries, needed for -u --stop_after_init
-    rc = 0
+    preload = []
     if config['db_name']:
-        for dbname in config['db_name'].split(','):
-            if not preload_registry(dbname):
-                rc += 1
+        preload = config['db_name'].split(',')
 
-    if not config["stop_after_init"]:
-        setup_pid_file()
-        openerp.service.server.start()
-        if config['pidfile']:
-            os.unlink(config['pidfile'])
-    else:
-        sys.exit(rc)
+    stop = config["stop_after_init"]
 
-    _logger.info('OpenERP server is running, waiting for connections...')
-    quit_on_signals()
+    setup_pid_file()
+    rc = openerp.service.server.start(preload=preload, stop=stop)
+    if config['pidfile']:
+        os.unlink(config['pidfile'])
+    sys.exit(rc)
 
 class Server(Command):
     def run(self, args):
diff --git a/openerp/http.py b/openerp/http.py
index 7ce70795a82..fe5b113d286 100644
--- a/openerp/http.py
+++ b/openerp/http.py
@@ -168,7 +168,10 @@ class WebRequest(object):
         """
         # some magic to lazy create the cr
         if not self._cr:
-            self._cr = self.registry.db.cursor()
+            if openerp.tools.config['test_enable'] and self.session_id in openerp.tests.common.HTTP_SESSION:
+                self._cr = openerp.tests.common.HTTP_SESSION[self.session_id]
+            else:
+                self._cr = self.registry.db.cursor()
         return self._cr
 
     def __enter__(self):
@@ -177,7 +180,7 @@ class WebRequest(object):
 
     def __exit__(self, exc_type, exc_value, traceback):
         _request_stack.pop()
-        if self._cr:
+        if self._cr and not (openerp.tools.config['test_enable'] and self.session_id in openerp.tests.common.HTTP_SESSION):
             if exc_type is None:
                 self._cr.commit()
             self._cr.close()
@@ -208,7 +211,7 @@ class WebRequest(object):
             args = (request,) + args
         # Correct exception handling and concurency retry
         @service_model.check
-        def checked_call(dbname, *a, **kw):
+        def checked_call(___dbname, *a, **kw):
             return self.func(*a, **kw)
 
         # FIXME: code and rollback management could be cleaned
@@ -441,6 +444,7 @@ class HttpRequest(WebRequest):
             elif request.func.routing.get('methods'):
                 methods = ', '.join(request.func.routing['methods'])
             response.headers.set('Access-Control-Allow-Methods', methods)
+            response.headers.set('Access-Control-Max-Age',60*60*24)
             response.headers.set('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept')
             return response
 
@@ -831,6 +835,40 @@ class OpenERPSession(werkzeug.contrib.sessions.Session):
 
         return Model(self, model)
 
+    def save_action(self, action):
+        """
+        This method store an action object in the session and returns an integer
+        identifying that action. The method get_action() can be used to get
+        back the action.
+
+        :param the_action: The action to save in the session.
+        :type the_action: anything
+        :return: A key identifying the saved action.
+        :rtype: integer
+        """
+        saved_actions = self.setdefault('saved_actions', {"next": 1, "actions": {}})
+        # we don't allow more than 10 stored actions
+        if len(saved_actions["actions"]) >= 10:
+            del saved_actions["actions"][min(saved_actions["actions"])]
+        key = saved_actions["next"]
+        saved_actions["actions"][key] = action
+        saved_actions["next"] = key + 1
+        self.modified = True
+        return key
+
+    def get_action(self, key):
+        """
+        Gets back a previously saved action. This method can return None if the action
+        was saved since too much time (this case should be handled in a smart way).
+
+        :param key: The key given by save_action()
+        :type key: integer
+        :return: The saved action or None.
+        :rtype: anything
+        """
+        saved_actions = self.get('saved_actions', {})
+        return saved_actions.get("actions", {}).get(key)
+
 def session_gc(session_store):
     if random.random() < 0.001:
         # we keep session one week
@@ -972,9 +1010,12 @@ class Root(object):
     def setup_db(self, httprequest):
         db = httprequest.session.db
         # Check if session.db is legit
-        if db and db not in db_filter([db], httprequest=httprequest):
-            httprequest.session.logout()
-            db = None
+        if db:
+            if db not in db_filter([db], httprequest=httprequest):
+                _logger.warn("Logged into database '%s', but dbfilter "
+                             "rejects it; logging session out.", db)
+                httprequest.session.logout()
+                db = None
 
         if not db:
             httprequest.session.db = db_monodb(httprequest)
@@ -1140,6 +1181,6 @@ root = None
 def wsgi_postload():
     global root
     root = Root()
-    openerp.wsgi.register_wsgi_handler(root)
+    openerp.service.wsgi_server.register_wsgi_handler(root)
 
 # vim:et:ts=4:sw=4:
diff --git a/openerp/modules/__init__.py b/openerp/modules/__init__.py
index feaf014f568..55eeefaaa19 100644
--- a/openerp/modules/__init__.py
+++ b/openerp/modules/__init__.py
@@ -26,16 +26,10 @@
 
 from . import db, graph, loading, migration, module, registry
 
-# TODO temporarily expose those things
-from openerp.modules.module import \
-    get_modules, get_modules_with_version, \
-    load_information_from_description_file, \
-    get_module_resource, zip_directory, \
-    get_module_path, initialize_sys_path, \
-    load_openerp_module, init_module_models, \
-    adapt_version
-
 from openerp.modules.loading import load_modules
 
+from openerp.modules.module import get_modules, get_modules_with_version, \
+    load_information_from_description_file, get_module_resource, get_module_path, \
+    initialize_sys_path, load_openerp_module, init_module_models, adapt_version
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/modules/loading.py b/openerp/modules/loading.py
index 4e157c51d20..7ca0a6785d6 100644
--- a/openerp/modules/loading.py
+++ b/openerp/modules/loading.py
@@ -182,18 +182,12 @@ def load_module_graph(cr, graph, status=None, perform_checks=True, skip_modules=
             migrations.migrate_module(package, 'post')
 
             if has_demo:
-                # launch tests only in demo mode, as most tests will depend
-                # on demo data. Other tests can be added into the regular
-                # 'data' section, but should probably not alter the data,
-                # as there is no rollback.
+                # launch tests only in demo mode, allowing tests to use demo data.
                 if tools.config.options['test_enable']:
+                    # Yamel test
                     report.record_result(load_test(module_name, idref, mode))
-
-                    # Run the `fast_suite` and `checks` tests given by the module.
-                    if module_name == 'base':
-                        # Also run the core tests after the database is created.
-                        report.record_result(openerp.modules.module.run_unit_tests('openerp'))
-                    report.record_result(openerp.modules.module.run_unit_tests(module_name))
+                    # Python tests
+                    report.record_result(openerp.modules.module.run_unit_tests(module_name, cr.dbname))
 
             processed_modules.append(package.name)
 
@@ -247,7 +241,6 @@ def load_marked_modules(cr, graph, states, force, progressdict, report, loaded_m
         if not processed: break
     return processed_modules
 
-
 def load_modules(db, force_demo=False, status=None, update_module=False):
     # TODO status['progress'] reporting is broken: used twice (and reset each
     # time to zero) in load_module_graph, not fine-grained enough.
diff --git a/openerp/modules/module.py b/openerp/modules/module.py
index cf3ff61805e..e3b8e10cc97 100644
--- a/openerp/modules/module.py
+++ b/openerp/modules/module.py
@@ -20,32 +20,31 @@
 #
 ##############################################################################
 
+import base64
 import imp
 import itertools
+import logging
 import os
-from os.path import join as opj
+import re
 import sys
 import types
-import zipimport
-
-import openerp.tools as tools
-import openerp.tools.osutil as osutil
-from openerp.tools.safe_eval import safe_eval as eval
-
-import zipfile
-import openerp.release as release
-
-import re
-import base64
-from zipfile import PyZipFile, ZIP_DEFLATED
 from cStringIO import StringIO
+from os.path import join as opj
 
-import logging
+import unittest2
+
+import openerp
+import openerp.tools as tools
+import openerp.release as release
+from openerp.tools.safe_eval import safe_eval as eval
 
 _logger = logging.getLogger(__name__)
 _test_logger = logging.getLogger('openerp.tests')
 
+# addons path ','.joined
 _ad = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'addons') # default addons path (base)
+
+# addons path as a list
 ad_paths = []
 
 # Modules already loaded
@@ -120,7 +119,6 @@ def get_module_path(module, downloaded=False, display_warning=True):
         _logger.warning('module %s: module not found', module)
     return False
 
-
 def get_module_filetree(module, dir='.'):
     path = get_module_path(module)
     if not path:
@@ -132,12 +130,7 @@ def get_module_filetree(module, dir='.'):
     if dir.startswith('..') or (dir and dir[0] == '/'):
         raise Exception('Cannot access file outside the module')
 
-    if not os.path.isdir(path):
-        # zipmodule
-        zip = zipfile.ZipFile(path + ".zip")
-        files = ['/'.join(f.split('/')[1:]) for f in zip.namelist()]
-    else:
-        files = osutil.listdir(path, True)
+    files = openerp.tools.osutil.listdir(path, True)
 
     tree = {}
     for f in files:
@@ -154,68 +147,6 @@ def get_module_filetree(module, dir='.'):
 
     return tree
 
-def zip_directory(directory, b64enc=True, src=True):
-    """Compress a directory
-
-    @param directory: The directory to compress
-    @param base64enc: if True the function will encode the zip file with base64
-    @param src: Integrate the source files
-
-    @return: a string containing the zip file
-    """
-
-    RE_exclude = re.compile('(?:^\..+\.swp$)|(?:\.py[oc]$)|(?:\.bak$)|(?:\.~.~$)', re.I)
-
-    def _zippy(archive, path, src=True):
-        path = os.path.abspath(path)
-        base = os.path.basename(path)
-        for f in osutil.listdir(path, True):
-            bf = os.path.basename(f)
-            if not RE_exclude.search(bf) and (src or bf == '__openerp__.py' or not bf.endswith('.py')):
-                archive.write(os.path.join(path, f), os.path.join(base, f))
-
-    archname = StringIO()
-    archive = PyZipFile(archname, "w", ZIP_DEFLATED)
-
-    # for Python 2.5, ZipFile.write() still expects 8-bit strings (2.6 converts to utf-8)
-    directory = tools.ustr(directory).encode('utf-8')
-
-    archive.writepy(directory)
-    _zippy(archive, directory, src=src)
-    archive.close()
-    archive_data = archname.getvalue()
-    archname.close()
-
-    if b64enc:
-        return base64.encodestring(archive_data)
-
-    return archive_data
-
-def get_module_as_zip(modulename, b64enc=True, src=True):
-    """Generate a module as zip file with the source or not and can do a base64 encoding
-
-    @param modulename: The module name
-    @param b64enc: if True the function will encode the zip file with base64
-    @param src: Integrate the source files
-
-    @return: a stream to store in a file-like object
-    """
-
-    ap = get_module_path(str(modulename))
-    if not ap:
-        raise Exception('Unable to find path for module %s' % modulename)
-
-    ap = ap.encode('utf8')
-    if os.path.isfile(ap + '.zip'):
-        val = file(ap + '.zip', 'rb').read()
-        if b64enc:
-            val = base64.encodestring(val)
-    else:
-        val = zip_directory(ap, b64enc, src)
-
-    return val
-
-
 def get_module_resource(module, *args):
     """Return the full path of a resource of the given module.
 
@@ -235,12 +166,6 @@ def get_module_resource(module, *args):
         # the module is a directory - ignore zip behavior
         if os.path.exists(resource_path):
             return resource_path
-    elif zipfile.is_zipfile(mod_path + '.zip'):
-        zip = zipfile.ZipFile( mod_path + ".zip")
-        files = ['/'.join(f.split('/')[1:]) for f in zip.namelist()]
-        resource_path = '/'.join(args)
-        if resource_path in files:
-            return opj(mod_path, resource_path)
     return False
 
 def get_module_icon(module):
@@ -258,7 +183,7 @@ def load_information_from_description_file(module):
     mod_path = get_module_path(module)
     if terp_file:
         info = {}
-        if os.path.isfile(terp_file) or zipfile.is_zipfile(mod_path+'.zip'):
+        if os.path.isfile(terp_file):
             # default values for descriptor
             info = {
                 'application': False,
@@ -300,7 +225,6 @@ def load_information_from_description_file(module):
     _logger.debug('module %s: no __openerp__.py file found.', module)
     return {}
 
-
 def init_module_models(cr, module_name, obj_list):
     """ Initialize a list of models.
 
@@ -342,12 +266,7 @@ def load_openerp_module(module_name):
     initialize_sys_path()
     try:
         mod_path = get_module_path(module_name)
-        zip_mod_path = '' if not mod_path else mod_path + '.zip'
-        if not os.path.isfile(zip_mod_path):
-            __import__('openerp.addons.' + module_name)
-        else:
-            zimp = zipimport.zipimporter(zip_mod_path)
-            zimp.load_module(module_name)
+        __import__('openerp.addons.' + module_name)
 
         # Call the module's post-load hook. This can done before any model or
         # data has been initialized. This is ok as the post-load hook is for
@@ -357,8 +276,7 @@ def load_openerp_module(module_name):
             getattr(sys.modules['openerp.addons.' + module_name], info['post_load'])()
 
     except Exception, e:
-        mt = isinstance(e, zipimport.ZipImportError) and 'zip ' or ''
-        msg = "Couldn't load %smodule %s" % (mt, module_name)
+        msg = "Couldn't load module %s" % (module_name)
         _logger.critical(msg)
         _logger.critical(e)
         raise
@@ -378,7 +296,7 @@ def get_modules():
         def is_really_module(name):
             manifest_name = opj(dir, name, '__openerp__.py')
             zipfile_name = opj(dir, name)
-            return os.path.isfile(manifest_name) or zipfile.is_zipfile(zipfile_name)
+            return os.path.isfile(manifest_name)
         return map(clean, filter(is_really_module, os.listdir(dir)))
 
     plist = []
@@ -387,7 +305,6 @@ def get_modules():
         plist.extend(listdir(ad))
     return list(set(plist))
 
-
 def get_modules_with_version():
     modules = get_modules()
     res = dict.fromkeys(modules, adapt_version('1.0'))
@@ -405,126 +322,58 @@ def adapt_version(version):
         version = '%s.%s' % (serie, version)
     return version
 
-
-def get_test_modules(module, submodule, explode):
-    """
-    Return a list of submodules containing tests.
-    `submodule` can be:
-      - None
-      - the name of a submodule
-      - '__fast_suite__'
-      - '__sanity_checks__'
-    """
-    # Turn command-line module, submodule into importable names.
-    if module is None:
-        pass
-    elif module == 'openerp':
-        module = 'openerp.tests'
-    else:
-        module = 'openerp.addons.' + module + '.tests'
-
+def get_test_modules(module):
+    """ Return a list of module for the addons potentialy containing tests to
+    feed unittest2.TestLoader.loadTestsFromModule() """
     # Try to import the module
+    module = 'openerp.addons.' + module + '.tests'
     try:
-        __import__(module)
+        m = __import__(module)
     except Exception, e:
-        if explode:
-            print 'Can not `import %s`.' % module
-            import logging
-            logging.exception('')
-            sys.exit(1)
-        else:
-            if str(e) == 'No module named tests':
-                # It seems the module has no `tests` sub-module, no problem.
-                pass
-            else:
-                _logger.exception('Can not `import %s`.', module)
-            return []
+        # If module has no `tests` sub-module, no problem.
+        if str(e) != 'No module named tests':
+            _logger.exception('Can not `import %s`.', module)
+        return []
 
-    # Discover available test sub-modules.
-    m = sys.modules[module]
-    submodule_names =  sorted([x for x in dir(m) \
-        if x.startswith('test_') and \
-        isinstance(getattr(m, x), types.ModuleType)])
-    submodules = [getattr(m, x) for x in submodule_names]
+    # include submodules too
+    result = []
+    for name in sys.modules:
+        if name.startswith(module) and sys.modules[name]:
+            result.append(sys.modules[name])
+    return result
 
-    def show_submodules_and_exit():
-        if submodule_names:
-            print 'Available submodules are:'
-            for x in submodule_names:
-                print ' ', x
-        sys.exit(1)
+# Use a custom stream object to log the test executions.
+class TestStream(object):
+    def __init__(self):
+        self.r = re.compile(r'^-*$|^ *... *$|^ok$')
+    def flush(self):
+        pass
+    def write(self, s):
+        if self.r.match(s):
+            return
+        first = True
+        for c in s.split('\n'):
+            if not first:
+                c = '` ' + c
+            first = False
+            _test_logger.info(c)
 
-    if submodule is None:
-        # Use auto-discovered sub-modules.
-        ms = submodules
-    elif submodule == '__fast_suite__':
-        # Obtain the explicit test sub-modules list.
-        ms = getattr(sys.modules[module], 'fast_suite', None)
-        # `suite` was used before the 6.1 release instead of `fast_suite`.
-        ms = ms if ms else getattr(sys.modules[module], 'suite', None)
-        if ms is None:
-            if explode:
-                print 'The module `%s` has no defined test suite.' % (module,)
-                show_submodules_and_exit()
-            else:
-                ms = []
-    elif submodule == '__sanity_checks__':
-        ms = getattr(sys.modules[module], 'checks', None)
-        if ms is None:
-            if explode:
-                print 'The module `%s` has no defined sanity checks.' % (module,)
-                show_submodules_and_exit()
-            else:
-                ms = []
-    else:
-        # Pick the command-line-specified test sub-module.
-        m = getattr(sys.modules[module], submodule, None)
-        ms = [m]
-
-        if m is None:
-            if explode:
-                print 'The module `%s` has no submodule named `%s`.' % \
-                    (module, submodule)
-                show_submodules_and_exit()
-            else:
-                ms = []
-
-    return ms
-
-def run_unit_tests(module_name):
+def run_unit_tests(module_name, dbname):
     """
     Return True or False if some tests were found and succeeded or failed.
     Return None if no test was found.
     """
-    import unittest2
-    ms = get_test_modules(module_name, '__fast_suite__', explode=False)
-    # TODO: No need to try again if the above call failed because of e.g. a syntax error.
-    ms.extend(get_test_modules(module_name, '__sanity_checks__', explode=False))
-    suite = unittest2.TestSuite()
-    for m in ms:
-        suite.addTests(unittest2.TestLoader().loadTestsFromModule(m))
-    if ms:
-        _test_logger.info('module %s: executing %s `fast_suite` and/or `checks` sub-modules', module_name, len(ms))
-        # Use a custom stream object to log the test executions.
-        class MyStream(object):
-            def __init__(self):
-                self.r = re.compile(r'^-*$|^ *... *$|^ok$')
-            def flush(self):
-                pass
-            def write(self, s):
-                if self.r.match(s):
-                    return
-                first = True
-                for c in s.split('\n'):
-                    if not first:
-                        c = '` ' + c
-                    first = False
-                    _test_logger.info(c)
-        result = unittest2.TextTestRunner(verbosity=2, stream=MyStream()).run(suite)
-        if result.wasSuccessful():
-            return True
-        else:
+    mods = get_test_modules(module_name)
+    r = True
+    for m in mods:
+        suite = unittest2.TestSuite()
+        for t in unittest2.TestLoader().loadTestsFromModule(m):
+            suite.addTest(t)
+        _logger.log(logging.INFO, 'module %s: running test %s.', module_name, m.__name__)
+        result = unittest2.TextTestRunner(verbosity=2, stream=TestStream()).run(suite)
+        if not result.wasSuccessful():
+            r = False
             _logger.error('module %s: at least one error occurred in a test', module_name)
-            return False
+    return r
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/modules/registry.py b/openerp/modules/registry.py
index 7dcf02020fd..a277d4f6402 100644
--- a/openerp/modules/registry.py
+++ b/openerp/modules/registry.py
@@ -193,6 +193,30 @@ class Registry(Mapping):
         finally:
             cr.close()
 
+class TestRLock(object):
+    def __init__(self):
+        self._lock = threading.RLock()
+    def acquire(self):
+        if openerp.tools.config['test_enable']:
+            return
+        return self._lock.acquire()
+    def release(self):
+        if openerp.tools.config['test_enable']:
+            return
+        return self._lock.release()
+    def __enter__(self):
+        self.acquire()
+    def __exit__(self, type, value, traceback):
+        self.release()
+
+#    def __enter__(self, *l, **kw):
+#        if openerp.tools.config['test_enable']:
+#            return
+#        return super(TestRlock, self).__enter__(*l, **kw)
+#    def __exit__(self, *l, **kw):
+#        if openerp.tools.config['test_enable']:
+#            return
+#        return super(TestRlock, self).__exit__(*l, **kw)
 
 class RegistryManager(object):
     """ Model registries manager.
@@ -204,7 +228,7 @@ class RegistryManager(object):
     # Mapping between db name and model registry.
     # Accessed through the methods below.
     registries = {}
-    registries_lock = threading.RLock()
+    registries_lock = TestRLock()
 
     @classmethod
     def get(cls, db_name, force_demo=False, status=None, update_module=False):
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index e187d5d5c81..6ac65125620 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -2293,12 +2293,12 @@ class BaseModel(object):
             f for f in fields
             if f not in ('id', 'sequence')
             if fget[f]['type'] in ('integer', 'float')
-            if (f in self._columns and getattr(self._columns[f], '_classic_write'))]
+            if (f in self._all_columns and getattr(self._all_columns[f].column, '_classic_write'))]
         for f in aggregated_fields:
             group_operator = fget[f].get('group_operator', 'sum')
             if flist:
                 flist += ', '
-            qualified_field = '"%s"."%s"' % (self._table, f)
+            qualified_field = self._inherits_join_calc(f, query)
             flist += "%s(%s) AS %s" % (group_operator, qualified_field, f)
 
         gb = groupby and (' GROUP BY ' + qualified_groupby_field) or ''
diff --git a/openerp/release.py b/openerp/release.py
index 1ad35340496..8670ef50abc 100644
--- a/openerp/release.py
+++ b/openerp/release.py
@@ -30,7 +30,7 @@ RELEASE_LEVELS_DISPLAY = {ALPHA: ALPHA,
 # properly comparable using normal operarors, for example:
 #  (6,1,0,'beta',0) < (6,1,0,'candidate',1) < (6,1,0,'candidate',2)
 #  (6,1,0,'candidate',2) < (6,1,0,'final',0) < (6,1,2,'final',0)
-version_info = (8, 0, 0, ALPHA, 1)
+version_info = (7, 'saas~3', 0, FINAL, 0)
 version = '.'.join(map(str, version_info[:2])) + RELEASE_LEVELS_DISPLAY[version_info[3]] + str(version_info[4] or '')
 serie = major_version = '.'.join(map(str, version_info[:2]))
 
diff --git a/openerp/service/model.py b/openerp/service/model.py
index a2c2dff90c5..a637e234295 100644
--- a/openerp/service/model.py
+++ b/openerp/service/model.py
@@ -40,9 +40,10 @@ def dispatch(method, params):
 
 def check(f):
     @wraps(f)
-    def wrapper(dbname, *args, **kwargs):
+    def wrapper(___dbname, *args, **kwargs):
         """ Wraps around OSV functions and normalises a few exceptions
         """
+        dbname = ___dbname      # NOTE: this forbid to use "___dbname" as arguments in http routes
 
         def tr(src, ttype):
             # We try to do the same as the _(), but without the frame
@@ -107,7 +108,7 @@ def check(f):
         tries = 0
         while True:
             try:
-                if openerp.registry(dbname)._init:
+                if openerp.registry(dbname)._init and not openerp.tools.config['test_enable']:
                     raise openerp.exceptions.Warning('Currently, this database is not fully loaded and can not be used.')
                 return f(dbname, *args, **kwargs)
             except OperationalError, e:
diff --git a/openerp/service/server.py b/openerp/service/server.py
index 6a558a24e91..5372459cd41 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -9,6 +9,7 @@ import os.path
 import platform
 import psutil
 import random
+import re
 import resource
 import select
 import signal
@@ -17,6 +18,7 @@ import subprocess
 import sys
 import threading
 import time
+import unittest2
 
 import werkzeug.serving
 
@@ -306,7 +308,7 @@ class ThreadedServer(CommonServer):
         openerp.modules.registry.RegistryManager.delete_all()
         logging.shutdown()
 
-    def run(self):
+    def run(self, preload=None, stop=False):
         """ Start the http server and the cron thread then wait for a signal.
 
         The first SIGINT or SIGTERM signal will initiate a graceful shutdown while
@@ -314,6 +316,13 @@ class ThreadedServer(CommonServer):
         """
         self.start()
 
+        preload_registries(preload)
+
+        if stop:
+            self.stop()
+            return
+
+
         # Wait for a first signal to be handled. (time.sleep will be interrupted
         # by the signal handler.) The try/except is for the win32 case.
         try:
@@ -362,7 +371,7 @@ class GeventServer(CommonServer):
         self.httpd.stop()
         gevent.shutdown()
 
-    def run(self):
+    def run(self, preload, stop):
         self.start()
         self.stop()
 
@@ -569,8 +578,15 @@ class PreforkServer(CommonServer):
             self.worker_kill(pid, signal.SIGTERM)
         self.socket.close()
 
-    def run(self):
+    def run(self, preload, stop):
         self.start()
+
+        preload_registries(preload)
+
+        if stop:
+            self.stop()
+            return
+
         _logger.debug("Multiprocess starting")
         while 1:
             try:
@@ -587,7 +603,7 @@ class PreforkServer(CommonServer):
             except Exception,e:
                 _logger.exception(e)
                 self.stop(False)
-                sys.exit(-1)
+                return -1
 
 class Worker(object):
     """ Workers """
@@ -809,7 +825,50 @@ def _reexec(updated_modules=None):
         args.insert(0, exe)
     os.execv(sys.executable, args)
 
-def start():
+def load_test_file_yml(test_file):
+    cr = registry.db.cursor()
+    openerp.tools.convert_yaml_import(cr, 'base', file(test_file), 'test', {}, 'test', True)
+    cr.rollback()
+    cr.close()
+
+def load_test_file_py(test_file):
+    # Locate python module based on its filename and run the tests
+    test_path, _ = os.path.splitext(os.path.abspath(test_file))
+    for mod_name, mod_mod in sys.modules.items():
+        if mod_mod:
+            mod_path, _ = os.path.splitext(getattr(mod_mod, '__file__', ''))
+            if test_path == mod_path:
+                suite = unittest2.TestSuite()
+                for t in unittest2.TestLoader().loadTestsFromModule(mod_mod):
+                    suite.addTest(t)
+                _logger.log(logging.INFO, 'running tests %s.', mod_mod.__name__)
+                result = unittest2.TextTestRunner(verbosity=2, stream=openerp.modules.module.TestStream()).run(suite)
+                if not result.wasSuccessful():
+                    r = False
+                    _logger.error('%s: at least one error occurred in a test', test_file)
+
+def preload_registries(dbnames):
+    """ Preload a registries, possibly run a test file."""
+    # TODO: move all config checks to args dont check tools.config here
+    config = openerp.tools.config
+    test_file = config['test_file']
+    dbnames = dbnames or []
+    for dbname in dbnames:
+        try:
+            update_module = config['init'] or config['update']
+            registry = openerp.modules.registry.RegistryManager.new(dbname, update_module=update_module)
+            # run test_file if provided
+            if test_file:
+                _logger.info('loading test file %s', test_file)
+                if test_file.endswith('yml'):
+                    load_test_file_yml(test_file)
+                elif test_file.endswith('py'):
+                    load_test_file_py(test_file)
+        except Exception:
+            _logger.exception('Failed to initialize database `%s`.', dbname)
+            return
+
+def start(preload=None, stop=False):
     """ Start the openerp http server and cron processor.
     """
     global server
@@ -825,7 +884,7 @@ def start():
         autoreload = AutoReload(server)
         autoreload.run()
 
-    server.run()
+    rc = server.run(preload, stop)
 
     # like the legend of the phoenix, all ends with beginnings
     if getattr(openerp, 'phoenix', False):
@@ -833,7 +892,8 @@ def start():
         if config['auto_reload']:
             modules = autoreload.modules.keys()
         _reexec(modules)
-    sys.exit(0)
+
+    return rc if rc else 0
 
 def restart():
     """ Restart the server
diff --git a/openerp/tests/__init__.py b/openerp/tests/__init__.py
index a74122424de..bdf699e6467 100644
--- a/openerp/tests/__init__.py
+++ b/openerp/tests/__init__.py
@@ -1,49 +1,2 @@
-# -*- coding: utf-8 -*-
-"""
-Tests for the OpenERP library.
-
-This module groups a few sub-modules containing unittest2 test cases.
-
-Tests can be explicitely added to the `fast_suite` or `checks` lists or not.
-See the :ref:`test-framework` section in the :ref:`features` list.
-"""
-import test_acl
-import test_basecase
-import test_db_cursor
-import test_expression
-import test_fields
-import test_ir_filters
-import test_ir_sequence
-import test_mail
-import test_misc
-import test_orm
-import test_osv
-import test_translate
-import test_view_validation
-import test_qweb
-import test_func
-# This need a change in `oe run-tests` to only run fast_suite + checks by default.
-# import test_xmlrpc
-
-fast_suite = [
-    test_ir_sequence,
-    test_ir_filters
-]
-
-checks = [
-    test_acl,
-    test_expression,
-    test_mail,
-    test_db_cursor,
-    test_orm,
-    test_fields,
-    test_basecase,
-    test_view_validation,
-    test_misc,
-    test_osv,
-    test_translate,
-    test_qweb,
-    test_func,
-]
- 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+import common
+from common import *
diff --git a/openerp/tests/common.py b/openerp/tests/common.py
index df00e61f140..dd0350aa7ca 100644
--- a/openerp/tests/common.py
+++ b/openerp/tests/common.py
@@ -1,17 +1,28 @@
 # -*- coding: utf-8 -*-
 """
-The module :mod:`openerp.tests.common` provides a few helpers and classes to write
-tests.
+The module :mod:`openerp.tests.common` provides unittest2 test cases and a few
+helpers and classes to write tests.
+
 """
+import json
+import logging
+import os
+import select
+import subprocess
+import sys
 import threading
 import time
 import unittest2
+import uuid
 import xmlrpclib
 
 import openerp
 
+_logger = logging.getLogger(__name__)
+
 # The openerp library is supposed already configured.
 ADDONS_PATH = openerp.tools.config['addons_path']
+HOST = '127.0.0.1'
 PORT = openerp.tools.config['xmlrpc_port']
 DB = openerp.tools.config['db_name']
 
@@ -22,26 +33,11 @@ DB = openerp.tools.config['db_name']
 if not DB and hasattr(threading.current_thread(), 'dbname'):
     DB = threading.current_thread().dbname
 
-HOST = '127.0.0.1'
-
 ADMIN_USER = 'admin'
 ADMIN_USER_ID = openerp.SUPERUSER_ID
 ADMIN_PASSWORD = 'admin'
 
-def start_openerp():
-    """
-    Start the OpenERP server similary to the openerp-server script.
-    """
-    openerp.service.start_services()
-
-    # Ugly way to ensure the server is listening.
-    time.sleep(2)
-
-def stop_openerp():
-    """
-    Shutdown the OpenERP server similarly to a single ctrl-c.
-    """
-    openerp.service.stop_services()
+HTTP_SESSION = {}
 
 class BaseCase(unittest2.TestCase):
     """
@@ -116,37 +112,120 @@ class SingleTransactionCase(BaseCase):
         cls.cr.close()
 
 
-class RpcCase(unittest2.TestCase):
-    """
-    Subclass of TestCase with a few XML-RPC proxies.
+class HttpCase(TransactionCase):
+    """ Transactionnal HTTP TestCase with a phantomjs helper.
     """
 
     def __init__(self, methodName='runTest'):
-        super(RpcCase, self).__init__(methodName)
+        super(HttpCase, self).__init__(methodName)
+        # v8 api with correct xmlrpc exception handling.
+        self.xmlrpc_url = url_8 = 'http://%s:%d/xmlrpc/2/' % (HOST, PORT)
+        self.xmlrpc_common = xmlrpclib.ServerProxy(url_8 + 'common')
+        self.xmlrpc_db = xmlrpclib.ServerProxy(url_8 + 'db')
+        self.xmlrpc_object = xmlrpclib.ServerProxy(url_8 + 'object')
 
-        class A(object):
-            pass
-        self.proxy = A()
+    def setUp(self):
+        super(HttpCase, self).setUp()
+        self.session_id = uuid.uuid4().hex
+        HTTP_SESSION[self.session_id] = self.cr
 
-        # Use the old (pre 6.1) API.
-        self.proxy.url_60 = url_60 = 'http://%s:%d/xmlrpc/' % (HOST, PORT)
-        self.proxy.common_60 = xmlrpclib.ServerProxy(url_60 + 'common')
-        self.proxy.db_60 = xmlrpclib.ServerProxy(url_60 + 'db')
-        self.proxy.object_60 = xmlrpclib.ServerProxy(url_60 + 'object')
-        #self.proxy.edi_60 = xmlrpclib.ServerProxy(url_60 + 'edi')
+    def tearDown(self):
+        del HTTP_SESSION[self.session_id]
+        super(HttpCase, self).tearDown()
 
-        # Use the new (8) API.
-        self.proxy.url_8 = url_8 = 'http://%s:%d/xmlrpc/2/' % (HOST, PORT)
-        self.proxy.common_8 = xmlrpclib.ServerProxy(url_8 + 'common')
-        self.proxy.db_8 = xmlrpclib.ServerProxy(url_8 + 'db')
-        self.proxy.object_8 = xmlrpclib.ServerProxy(url_8 + 'object')
+    def phantom_poll(self, phantom, timeout):
+        """ Phantomjs Test protocol.
+
+        Use console.log in phantomjs to output test results:
+
+        - for a success: console.log("ok")
+        - for an error:  console.log("error")
+
+        Other lines are relayed to the test log.
+
+        """
+        t0 = time.time()
+        buf = ''
+        while 1:
+            # timeout
+            if time.time() > t0 + timeout:
+                raise Exception("phantomjs test timeout (%ss)" % timeout)
+
+            # read a byte
+            ready, _, _ = select.select([phantom.stdout], [], [], 0.5)
+            if ready:
+                s = phantom.stdout.read(1)
+                if s:
+                    buf += s
+                else:
+                    break
+
+            # process lines
+            if '\n' in buf:
+                line, buf = buf.split('\n', 1)
+                _logger.info("phantomjs: %s", line)
+                if line == "ok":
+                    _logger.info("phantomjs test successful")
+                    return
+                if line == "error":
+                    raise Exception("phantomjs test failed")
+
+    def phantom_run(self, cmd, timeout):
+        _logger.info('executing %s', cmd)
+        try:
+            phantom = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        except OSError:
+            _logger.info("phantomjs not found, test %s skipped", jsfile)
+        try:
+            self.phantom_poll(phantom, timeout)
+        finally:
+            # kill phantomjs if phantom.exit() wasn't called in the test
+            if phantom.poll() is None:
+                phantom.terminate()
+
+    def phantom_jsfile(self, jsfile, timeout=30, **kw):
+        options = {
+            'timeout' : timeout,
+            'port': PORT,
+            'db': DB,
+            'session_id': self.session_id,
+        }
+        options.update(kw)
+        phantomtest = os.path.join(os.path.dirname(__file__), 'phantomtest.js')
+        # phantom.args[0] == phantomtest path
+        # phantom.args[1] == options
+        cmd = ['phantomjs', jsfile, phantomtest, json.dumps(options)]
+        self.phantom_run(cmd, timeout)
+
+    def phantom_js(self, url_path, code, ready="window", timeout=30, **kw):
+        """ Test js code running in the browser
+        - load page given by url_path
+        - wait for ready object to be available
+        - eval(code) inside the page
+
+        To signal success test do:
+        console.log('ok')
+
+        To signal failure do:
+        console.log('error')
+
+        If neither are done before timeout test fails.
+        """
+        options = {
+            'url_path': url_path,
+            'code': code,
+            'ready': ready,
+            'timeout' : timeout,
+            'port': PORT,
+            'db': DB,
+            'login': ADMIN_USER,
+            'password': ADMIN_PASSWORD,
+            'session_id': self.session_id,
+        }
+        options.update(kw)
+        phantomtest = os.path.join(os.path.dirname(__file__), 'phantomtest.js')
+        cmd = ['phantomjs', phantomtest, json.dumps(options)]
+        self.phantom_run(cmd, timeout)
 
-    @classmethod
-    def generate_database_name(cls):
-        if hasattr(cls, '_database_id'):
-            cls._database_id += 1
-        else:
-            cls._database_id = 0
-        return '_fresh_name_' + str(cls._database_id) + '_'
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tests/phantomtest.js b/openerp/tests/phantomtest.js
new file mode 100644
index 00000000000..9e8baae512a
--- /dev/null
+++ b/openerp/tests/phantomtest.js
@@ -0,0 +1,127 @@
+// Phantomjs openerp helper
+
+function waitFor (ready, callback, timeout, timeoutMessageCallback) {
+    timeout = timeout || 10000;
+    var start = new Date().getTime();
+    var condition = ready();
+    var interval = setInterval(function() {
+        if ((new Date().getTime() - start < timeout) && !condition ) {
+            condition = ready();
+        } else {
+            if(!condition) {
+                var message = timeoutMessageCallback ? timeoutMessageCallback() : "Timeout after "+timeout+" ms";
+                console.log(message);
+                console.log("Waiting for " + ready);
+                console.log("error");
+                phantom.exit(1);
+            } else {
+                clearInterval(interval);
+                callback();
+            }
+        }
+    }, 250);
+}
+
+function PhantomTest() {
+    var self = this;
+    if(phantom.args.length === 1) {
+        this.options = JSON.parse(phantom.args[0]);
+    } else {
+        this.options = JSON.parse(phantom.args[1]);
+    }
+    this.inject = [];
+    this.timeout = this.options.timeout ? Math.round(parseFloat(this.options.timeout)*1000 - 5000) : 10000;
+    this.origin = 'http://localhost';
+    this.origin += this.options.port ? ':' + this.options.port : '';
+
+    // ----------------------------------------------------
+    // test reporting
+    // ----------------------------------------------------
+    this.error = function(message) {
+        console.log(message);
+        console.log("error");
+        phantom.exit(1);
+    };
+
+    // ----------------------------------------------------
+    // configure page
+    // ----------------------------------------------------
+    this.page = require('webpage').create();
+    this.page.viewportSize = { width: 1366, height: 768 };
+    this.page.addCookie({
+        'domain': 'localhost',
+        'name': 'session_id',
+        'value': this.options.session_id,
+    });
+    this.page.onError = function(message, trace) {
+        self.error(message + " " + trace);
+    };
+    this.page.onAlert = function(message) {
+        self.error(message);
+    };
+    this.page.onConsoleMessage = function(message) {
+        console.log(message);
+    };
+    this.page.onLoadFinished = function(status) {
+        if (status === "success") {
+            for (var k in self.inject) {
+                if(!page.injectJs(self.inject[k])) {
+                    self.error("Can't inject " + self.inject[k]);
+                }
+            }
+        }
+    };
+    setTimeout(function () {
+        self.page.evaluate(function () {
+            var message = ("Timeout\nhref: " + window.location.href
+                + "\nreferrer: " + document.referrer
+                + "\n\n" + document.body.innerHTML).replace(/[^a-z0-9\s~!@#$%^&*()_|+\-=?;:'",.<>\{\}\[\]\\\/]/gi, "*");
+            self.error(message);
+        });
+    }, self.timeout);
+
+    // ----------------------------------------------------
+    // run test
+    // ----------------------------------------------------
+    this.run = function(url_path, code, ready) {
+        if(self.options.login) {
+            qp = [];
+            qp.push('db=' + self.options.db);
+            qp.push('login=' + self.options.login);
+            qp.push('key=' + self.options.password);
+            qp.push('redirect=' + encodeURIComponent(url_path));
+            var url_path = "/web/login?" + qp.join('&');
+        }
+        var url = self.origin + url_path;
+        self.page.open(url, function(status) {
+            if (status !== 'success') {
+                self.error("failed to load " + url)
+            } else {
+                console.log('loaded', url, status);
+                // process ready
+                waitFor(function() {
+                    return self.page.evaluate(function (ready) { 
+                        var r = false;
+                        try {
+                            r = !!eval(ready);
+                        } catch(ex) {
+                            console.log("waiting for page " + ready)
+                        };
+                        return r;
+                    }, ready);
+                // run test
+                }, function() {
+                    self.page.evaluate(function (code) { return eval(code); }, code);
+                });
+            }
+        });
+    };
+}
+
+// js mode or jsfile mode
+if(phantom.args.length === 1) {
+    pt = new PhantomTest();
+    pt.run(pt.options.url_path, pt.options.code, pt.options.ready);
+}
+
+// vim:et:
diff --git a/openerp/tests/test_expression.py b/openerp/tests/test_expression.py
deleted file mode 100644
index 1c5678becf1..00000000000
--- a/openerp/tests/test_expression.py
+++ /dev/null
@@ -1,13 +0,0 @@
-import unittest2
-
-import openerp
-
-
-class test_domain_normalization(unittest2.TestCase):
-    def test_normalize_domain(self):
-        expression = openerp.osv.expression
-        norm_domain = domain = ['&', (1, '=', 1), ('a', '=', 'b')]
-        assert norm_domain == expression.normalize_domain(domain), "Normalized domains should be left untouched"
-        domain = [('x', 'in', ['y', 'z']), ('a.v', '=', 'e'), '|', '|', ('a', '=', 'b'), '!', ('c', '>', 'd'), ('e', '!=', 'f'), ('g', '=', 'h')]
-        norm_domain = ['&', '&', '&'] + domain
-        assert norm_domain == expression.normalize_domain(domain), "Non-normalized domains should be properly normalized"
diff --git a/openerp/tests/test_xmlrpc.py b/openerp/tests/test_xmlrpc.py
deleted file mode 100644
index 12bc828cb29..00000000000
--- a/openerp/tests/test_xmlrpc.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# -*- coding: utf-8 -*-
-# Run with one of these commands:
-#    > OPENERP_ADDONS_PATH='../../addons/trunk' OPENERP_PORT=8069 \
-#      OPENERP_DATABASE=yy PYTHONPATH=. python tests/test_xmlrpc.py
-#    > OPENERP_ADDONS_PATH='../../addons/trunk' OPENERP_PORT=8069 \
-#      OPENERP_DATABASE=yy nosetests tests/test_xmlrpc.py
-#    > OPENERP_ADDONS_PATH='../../../addons/trunk' OPENERP_PORT=8069 \
-#      OPENERP_DATABASE=yy PYTHONPATH=../:. unit2 test_xmlrpc
-import time
-import unittest2
-import xmlrpclib
-
-import common
-
-DB = None
-ADMIN_USER = common.ADMIN_USER
-ADMIN_USER_ID = common.ADMIN_USER_ID
-ADMIN_PASSWORD = common.ADMIN_PASSWORD
-
-def setUpModule():
-    common.start_openerp()
-    global DB
-    DB = common.RpcCase.generate_database_name()
-
-tearDownModule = common.stop_openerp
-
-class test_xmlrpc(common.RpcCase):
-
-    def test_00_xmlrpc_create_database_polling(self):
-        """
-        Simulate a OpenERP client requesting the creation of a database and
-        polling the server until the creation is complete.
-        """
-        progress_id = self.proxy.db_60.create(ADMIN_PASSWORD,DB, True, False,
-            ADMIN_PASSWORD)
-        while True:
-            time.sleep(1)
-            progress, users = self.proxy.db_60.get_progress(ADMIN_PASSWORD,
-                progress_id)
-            if progress == 1.0:
-                break
-
-    def test_xmlrpc_login(self):
-        """ Try to login on the common service. """
-        uid = self.proxy.common_60.login(DB, ADMIN_USER, ADMIN_PASSWORD)
-        assert uid == ADMIN_USER_ID
-
-    def test_xmlrpc_ir_model_search(self):
-        """ Try a search on the object service. """
-        o = self.proxy.object_60
-        ids = o.execute(DB, ADMIN_USER_ID, ADMIN_PASSWORD, 'ir.model', 'search', [])
-        assert ids
-        ids = o.execute(DB, ADMIN_USER_ID, ADMIN_PASSWORD, 'ir.model', 'search', [], {})
-        assert ids
-
-    def test_xmlrpc_8_ir_model_search(self):
-        """ Try a search on the object service. """
-        o = self.proxy.object_8
-        ids = o.execute(DB, ADMIN_USER_ID, ADMIN_PASSWORD, 'ir.model', 'search', [])
-        assert ids
-        ids = o.execute(DB, ADMIN_USER_ID, ADMIN_PASSWORD, 'ir.model', 'search', [], {})
-        assert ids
-
-    # This test was written to test the creation of a new RPC endpoint, not
-    # really for the EDI itself.
-    #def test_xmlrpc_import_edi_document(self):
-    #    """ Try to call an EDI method. """
-    #    msg_re = 'EDI Document is empty!'
-    #    with self.assertRaisesRegexp(Exception, msg_re):
-    #        self.proxy.edi_60.import_edi_document(DB, ADMIN_USER_ID, ADMIN_PASSWORD, {})
-
-    def test_zz_xmlrpc_drop_database(self):
-        """
-        Simulate a OpenERP client requesting the deletion of a database.
-        """
-        assert self.proxy.db_60.drop(ADMIN_PASSWORD, DB) is True
-
-if __name__ == '__main__':
-    unittest2.main()
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/tools/config.py b/openerp/tools/config.py
index ebfd8cea20d..91fdbca86ad 100644
--- a/openerp/tools/config.py
+++ b/openerp/tools/config.py
@@ -157,7 +157,7 @@ class configmanager(object):
         # Testing Group
         group = optparse.OptionGroup(parser, "Testing Configuration")
         group.add_option("--test-file", dest="test_file", my_default=False,
-                         help="Launch a YML test file.")
+                         help="Launch a python or YML test file.")
         group.add_option("--test-report-directory", dest="test_report_directory", my_default=False,
                          help="If set, will save sample of all reports in this directory.")
         group.add_option("--test-enable", action="store_true", dest="test_enable",
diff --git a/openerp/tools/safe_eval.py b/openerp/tools/safe_eval.py
index 7c2fee54183..b64b401a71c 100644
--- a/openerp/tools/safe_eval.py
+++ b/openerp/tools/safe_eval.py
@@ -67,7 +67,8 @@ _SAFE_OPCODES = _EXPR_OPCODES.union(set(opmap[x] for x in [
     'LOAD_NAME', 'CALL_FUNCTION', 'COMPARE_OP', 'LOAD_ATTR',
     'STORE_NAME', 'GET_ITER', 'FOR_ITER', 'LIST_APPEND', 'DELETE_NAME',
     'JUMP_FORWARD', 'JUMP_IF_TRUE', 'JUMP_IF_FALSE', 'JUMP_ABSOLUTE',
-    'MAKE_FUNCTION', 'SLICE+0', 'SLICE+1', 'SLICE+2', 'SLICE+3',
+    'MAKE_FUNCTION', 'SLICE+0', 'SLICE+1', 'SLICE+2', 'SLICE+3', 'BREAK_LOOP',
+    'CONTINUE_LOOP', 'RAISE_VARARGS',
     # New in Python 2.7 - http://bugs.python.org/issue4715 :
     'JUMP_IF_FALSE_OR_POP', 'JUMP_IF_TRUE_OR_POP', 'POP_JUMP_IF_FALSE',
     'POP_JUMP_IF_TRUE', 'SETUP_EXCEPT', 'END_FINALLY'
diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py
index c14244abd56..58eefc92df4 100644
--- a/openerp/tools/translate.py
+++ b/openerp/tools/translate.py
@@ -172,7 +172,7 @@ class GettextAlias(object):
             cr = getattr(s, 'cr', None)
         if not cr and allow_create:
             db = self._get_db()
-            if db:
+            if db is not None:
                 cr = db.cursor()
                 is_new_cr = True
         return cr, is_new_cr
diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 10c3663c173..060d261ef18 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -321,7 +321,6 @@ class YamlInterpreter(object):
                 view_info = model.fields_view_get(self.cr, SUPERUSER_ID, varg, 'form', context)
 
             record_dict = self._create_record(model, fields, view_info, default=default)
-            _logger.debug("RECORD_DICT %s" % record_dict)
             id = self.pool['ir.model.data']._update(self.cr, SUPERUSER_ID, record.model, \
                     self.module, record_dict, record.id, noupdate=self.isnoupdate(record), mode=self.mode, context=context)
             self.id_map[record.id] = int(id)
@@ -931,7 +930,7 @@ class YamlInterpreter(object):
 def yaml_import(cr, module, yamlfile, kind, idref=None, mode='init', noupdate=False, report=None):
     if idref is None:
         idref = {}
-    loglevel = logging.INFO if kind == 'test' else logging.DEBUG
+    loglevel = logging.DEBUG
     yaml_string = yamlfile.read()
     yaml_interpreter = YamlInterpreter(cr, module, idref, mode, filename=yamlfile.name, report=report, noupdate=noupdate, loglevel=loglevel)
     yaml_interpreter.process(yaml_string)
diff --git a/openerpcommand/__init__.py b/openerpcommand/__init__.py
index 9d5e81f0327..b7131913e1e 100644
--- a/openerpcommand/__init__.py
+++ b/openerpcommand/__init__.py
@@ -14,14 +14,13 @@ from . import initialize
 from . import model
 from . import module
 from . import read
-from . import run_tests
 from . import scaffold
 from . import uninstall
 from . import update
 from . import web
 from . import grunt_tests
 
-command_list_server = (conf, cron, drop, initialize, model, module, read, run_tests,
+command_list_server = (conf, cron, drop, initialize, model, module, read,
                        scaffold, uninstall, update, web, grunt_tests, )
 
 command_list_client = (Call, Open, Show, ConsumeNothing, ConsumeMemory,
diff --git a/openerpcommand/initialize.py b/openerpcommand/initialize.py
index 6261312de7e..3723e9f5c01 100644
--- a/openerpcommand/initialize.py
+++ b/openerpcommand/initialize.py
@@ -22,6 +22,8 @@ def install_openerp(database_name, create_database_flag, module_names, install_d
     # Install the import hook, to import openerp.addons.<module>.
     openerp.modules.module.initialize_sys_path()
 
+    print 
+
     registry = openerp.modules.registry.RegistryManager.get(
         database_name, update_module=True, force_demo=install_demo_data)
 
@@ -88,6 +90,8 @@ def run(args):
         args.addons = []
     config['addons_path'] = ','.join(args.addons)
 
+    print "MY addons path is", config['addons_path']
+
     if args.all_modules:
         module_names = common.get_addons_from_paths(args.addons, args.exclude)
     elif args.module:
diff --git a/openerpcommand/run_tests.py b/openerpcommand/run_tests.py
deleted file mode 100644
index 3e9fec5030c..00000000000
--- a/openerpcommand/run_tests.py
+++ /dev/null
@@ -1,214 +0,0 @@
-"""
-Execute the unittest2 tests available in OpenERP addons.
-"""
-
-import sys
-import types
-import argparse
-
-import common
-
-def get_test_modules(module, submodule, explode):
-    """
-    Return a list of submodules containing tests.
-    `submodule` can be:
-      - None
-      - the name of a submodule
-      - '__fast_suite__'
-      - '__sanity_checks__'
-    """
-    # Turn command-line module, submodule into importable names.
-    if module is None:
-        pass
-    elif module == 'openerp':
-        module = 'openerp.tests'
-    else:
-        module = 'openerp.addons.' + module + '.tests'
-
-    # Try to import the module
-    try:
-        __import__(module)
-    except Exception, e:
-        if explode:
-            print 'Can not `import %s`.' % module
-            import logging
-            logging.exception('')
-            sys.exit(1)
-        else:
-            if str(e) == 'No module named tests':
-                # It seems the module has no `tests` sub-module, no problem.
-                pass
-            else:
-                print 'Can not `import %s`.' % module
-            return []
-
-    # Discover available test sub-modules.
-    m = sys.modules[module]
-    submodule_names =  sorted([x for x in dir(m) \
-        if x.startswith('test_') and \
-        isinstance(getattr(m, x), types.ModuleType)])
-    submodules = [getattr(m, x) for x in submodule_names]
-
-    def show_submodules_and_exit():
-        if submodule_names:
-            print 'Available submodules are:'
-            for x in submodule_names:
-                print ' ', x
-        sys.exit(1)
-
-    fast_suite = getattr(m, 'fast_suite', [])
-    checks = getattr(m, 'checks', [])
-    if submodule is None:
-        # Use auto-discovered sub-modules.
-        ms = submodules
-    elif submodule == '__fast_suite__':
-        # `suite` was used before the 6.1 release instead of `fast_suite`.
-        ms = fast_suite if hasattr(m, 'fast_suite') else getattr(m, 'suite', None)
-        if not ms:
-            if explode:
-                print 'The module `%s` has no defined test suite.' % (module,)
-                show_submodules_and_exit()
-            else:
-                ms = []
-    elif submodule == '__sanity_checks__':
-        ms = checks
-        if not ms:
-            if explode:
-                print 'The module `%s` has no defined sanity checks.' % (module,)
-                show_submodules_and_exit()
-            else:
-                ms = []
-    elif submodule == '__slow_suite__':
-        ms = list(set(submodules).difference(fast_suite, checks))
-    else:
-        # Pick the command-line-specified test sub-module.
-        m = getattr(m, submodule, None)
-        ms = [m]
-
-        if m is None:
-            if explode:
-                print 'The module `%s` has no submodule named `%s`.' % \
-                    (module, submodule)
-                show_submodules_and_exit()
-            else:
-                ms = []
-
-    return ms
-
-def run(args):
-    import unittest2
-
-    import openerp
-
-    config = openerp.tools.config
-    config['db_name'] = args.database
-    if args.port:
-        config['xmlrpc_port'] = int(args.port)
-    config['admin_passwd'] = 'admin'
-    config['db_password'] = 'a2aevl8w' # TODO from .openerpserverrc
-
-    if args.addons:
-        args.addons = args.addons.replace(':',',').split(',')
-    else:
-        args.addons = []
-
-    # ensure no duplication in addons paths
-    args.addons = list(set(args.addons))
-    config['addons_path'] = ','.join(args.addons)
-
-    import logging
-    openerp.netsvc.init_alternative_logger()
-    logging.getLogger('openerp').setLevel(logging.CRITICAL)
-
-    # Install the import hook, to import openerp.addons.<module>.
-    openerp.modules.module.initialize_sys_path()
-
-    module = args.module
-    submodule = args.submodule
-
-    # Import the necessary modules and get the corresponding suite.
-    if module is None:
-        # TODO
-        modules = common.get_addons_from_paths(args.addons, []) # TODO openerp.addons.base is not included ?
-        test_modules = []
-        for module in ['openerp'] + modules:
-            test_modules.extend(
-                get_test_modules(module, submodule, explode=False))
-    else:
-        test_modules = get_test_modules(module, submodule, explode=True)
-
-    print 'Test modules:'
-    for test_module in test_modules:
-        print '    ', test_module.__name__
-    print
-    sys.stdout.flush()
-
-    if not args.dry_run:
-        suite = unittest2.TestSuite()
-        for test_module in test_modules:
-            suite.addTests(unittest2.TestLoader().loadTestsFromModule(test_module))
-        r = unittest2.TextTestRunner(verbosity=2).run(suite)
-        if r.errors or r.failures:
-            sys.exit(1)
-
-def add_parser(subparsers):
-    parser = subparsers.add_parser('run-tests',
-        description='Run the OpenERP server and/or addons tests.')
-    parser.add_argument('-d', '--database', metavar='DATABASE', required=True,
-        help='the database to test. Depending on the test suites, the '
-        'database must already exist or not.')
-    parser.add_argument('-p', '--port', metavar='PORT',
-        help='the port used for WML-RPC tests')
-    common.add_addons_argument(parser)
-
-    parser.add_argument(
-        '-m', '--module', metavar='MODULE', action=ModuleAction, default=None,
-        help="the module to test in `module[.submodule]` notation. "
-             "Use `openerp` for the core OpenERP tests. "
-             "Leave empty to run every declared tests. "
-             "Give a module but no submodule to run all the module's declared "
-             "tests. If both the module and the submodule are given, "
-             "the sub-module can be run even if it is not declared in the module.")
-    group = parser.add_mutually_exclusive_group()
-    group.add_argument(
-        '--fast-suite',
-        dest='submodule', action=GuardAction, nargs=0, const='__fast_suite__',
-        help='run only the tests explicitly declared in the fast suite (this '
-        'makes sense only with the bare `module` notation or no module at '
-        'all).')
-    group.add_argument(
-        '--sanity-checks',
-        dest='submodule', action=GuardAction, nargs=0, const='__sanity_checks__',
-        help='run only the sanity check tests')
-    group.add_argument(
-        '--slow-suite',
-        dest='submodule', action=GuardAction, nargs=0, const='__slow_suite__',
-        help="Only run slow tests (tests which are neither in the fast nor in"
-             " the sanity suite)")
-    parser.add_argument('--dry-run', action='store_true',
-        help='do not run the tests')
-
-    parser.set_defaults(run=run, submodule=None)
-
-class ModuleAction(argparse.Action):
-    def __call__(self, parser, namespace, values, option_string=None):
-        split = values.split('.')
-        if len(split) == 1:
-            module, submodule = values, None
-        elif len(split) == 2:
-            module, submodule = split
-        else:
-            raise argparse.ArgumentError(
-                option_string,
-                "must have the form 'module[.submodule]', got '%s'" % values)
-
-        setattr(namespace, self.dest, module)
-        if submodule is not None:
-            setattr(namespace, 'submodule', submodule)
-
-class GuardAction(argparse.Action):
-    def __call__(self, parser, namespace, values, option_string=None):
-        if getattr(namespace, self.dest, None):
-            print "%s value provided, ignoring '%s'" % (self.dest, option_string)
-            return
-        setattr(namespace, self.dest, self.const)