* Remove deprecated tests and dead code * Fix usage of mock * Moar fixes bzr revid: xmo@openerp.com-20120910105129-rxh3jqwkewh65rl3