From d3cca51abc5ae6b09e397b6d82089a15d312ee73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 11 Sep 2024 19:05:12 +0200
Subject: [PATCH] Create company and chart of account when activate modules in
 test scenario

---
 .../account/tests/scenario_account_active.rst | 17 ++++------
 .../tests/scenario_account_reconcile.rst      | 16 +++------
 .../scenario_account_reconcile_automatic.rst  | 16 +++------
 .../tests/scenario_account_reconciliation.rst | 16 +++------
 ...ount_reconciliation_alternate_currency.rst |  9 ++---
 ...ciliation_alternate_currency_write_off.rst |  9 ++---
 .../scenario_account_reconciliation_empty.rst |  9 ++---
 .../tests/scenario_close_fiscalyear.rst       | 16 +++------
 .../account/tests/scenario_move_cancel.rst    | 16 +++------
 modules/account/tests/scenario_move_copy.rst  |  9 ++---
 .../tests/scenario_move_line_delegate.rst     | 15 ++++----
 .../tests/scenario_move_line_group.rst        | 15 ++++----
 .../tests/scenario_move_line_reschedule.rst   | 15 ++++----
 .../account/tests/scenario_move_template.rst  | 16 +++------
 .../tests/scenario_renew_fiscalyear.rst       | 11 ++----
 modules/account/tests/scenario_reports.rst    | 12 +++----
 modules/account/tests/scenario_tax_code.rst   | 16 +++------
 .../tests/scenario_account_asset.rst          | 16 +++------
 .../scenario_account_asset_depreciated.rst    | 16 +++------
 .../tests/scenario_purchase_asset.rst         | 17 ++++------
 .../tests/scenario_account_budget.rst         | 16 +++------
 .../tests/scenario_account_cash_rounding.rst  | 23 ++++++-------
 ...count_cash_rounding_alternate_currency.rst | 21 +++++-------
 ...cenario_account_cash_rounding_purchase.rst | 21 +++++-------
 .../scenario_account_cash_rounding_sale.rst   | 21 +++++-------
 .../tests/scenario_deposit.rst                | 16 +++------
 .../scenario_deposit_second_currency.rst      |  8 ++---
 .../tests/scenario_account_dunning.rst        | 16 +++------
 .../tests/scenario_account_dunning_final.rst  | 14 +++-----
 .../tests/scenario_account_dunning_email.rst  | 17 ++++------
 .../tests/scenario_account_dunning_fee.rst    | 16 +++------
 .../tests/scenario_account_dunning_letter.rst | 17 ++++------
 .../tests/scenario_ec_operation_list.rst      | 15 ++++----
 .../account_es/tests/scenario_reporting.rst   | 15 ++++----
 .../scenario_reporting_alternate_currency.rst | 13 +++----
 .../scenario_reporting_cancelled_invoices.rst | 15 ++++----
 .../tests/scenario_reporting_compensate.rst   | 15 ++++----
 .../scenario_reporting_surcharge_tax.rst      | 13 +++----
 .../tests/scenario_renew_fiscalyear.rst       | 11 ++----
 .../tests/scenario_account_export.rst         |  9 ++---
 .../scenario_account_export_winbooks.rst      | 10 ++----
 modules/account_fr/tests/scenario_fec.rst     | 14 ++++----
 .../scenario_account_fr_chorus_invoice.rst    | 11 +++---
 .../scenario_cancelling_invoice_move.rst      | 17 ++++------
 .../tests/scenario_credit_note.rst            | 16 +++------
 .../tests/scenario_invoice.rst                | 12 +++----
 .../scenario_invoice_alternate_currency.rst   | 15 ++++----
 ...io_invoice_alternate_currency_exchange.rst |  8 ++---
 ..._invoice_alternate_currency_lower_rate.rst | 15 ++++----
 ...invoice_alternate_currency_rate_change.rst |  8 ++---
 .../scenario_invoice_alternative_payee.rst    | 16 +++------
 .../scenario_invoice_customer_sequential.rst  | 16 +++------
 .../tests/scenario_invoice_group_line.rst     | 16 +++------
 .../tests/scenario_invoice_in_future.rst      | 16 +++------
 .../tests/scenario_invoice_manual_tax.rst     | 16 +++------
 .../tests/scenario_invoice_overpayment.rst    | 16 +++------
 .../scenario_invoice_report_revision.rst      | 16 +++------
 .../scenario_invoice_reschedule_lines.rst     | 16 +++------
 .../tests/scenario_invoice_supplier.rst       | 16 +++------
 .../scenario_invoice_supplier_post_paid.rst   | 16 +++------
 .../tests/scenario_invoice_tax_deductible.rst | 16 +++------
 .../tests/scenario_invoice_with_credit.rst    | 16 +++------
 .../tests/scenario_renew_fiscalyear.rst       | 11 ++----
 .../tests/scenario_invoice_correction.rst     | 18 ++++------
 .../tests/scenario_account_invoice_defer.rst  | 17 ++++------
 .../tests/scenario_account_invoice_stock.rst  | 20 +++++------
 ...nario_account_invoice_stock_correction.rst | 20 +++++------
 .../scenario_account_invoice_watermark.rst    | 17 ++++------
 .../scenario_account_move_line_grouping.rst   | 17 ++++------
 .../tests/scenario_account_payment.rst        | 16 +++------
 ...o_account_payment_blocked_direct_debit.rst | 16 +++------
 .../scenario_account_payment_direct_debit.rst | 16 +++------
 ...o_account_payment_direct_debit_balance.rst |  9 ++---
 .../scenario_account_payment_dunning.rst      | 17 ++++------
 .../scenario_account_payment_invoice.rst      | 18 ++++------
 .../scenario_account_payment_planning.rst     | 16 +++------
 .../scenario_account_payment_statement.rst    | 10 ++----
 .../scenario_account_payment_warnings.rst     | 16 +++------
 .../scenario_account_payment_braintree.rst    | 12 +++----
 ...ario_account_negative_payment_clearing.rst | 17 ++++------
 .../scenario_account_payment_clearing.rst     | 14 ++++----
 ...payment_clearing_invoice_amount_to_pay.rst | 17 ++++------
 .../tests/scenario_account_payment_stripe.rst | 21 ++++--------
 ...cenario_account_payment_stripe_dispute.rst | 17 ++++------
 ...nario_account_payment_stripe_identical.rst |  5 ++-
 ...scenario_account_payment_stripe_intent.rst | 12 +++----
 ..._account_payment_stripe_refund_failure.rst | 17 +++-------
 .../scenario_account_receivable_rule.rst      | 17 ++++------
 ...nario_account_receivable_rule_overflow.rst | 17 ++++------
 ...ario_account_receivable_rule_statement.rst | 11 +++---
 .../tests/scenario_account_rule.rst           | 16 ++++-----
 .../tests/scenario_account_statement.rst      | 18 ++++------
 ...cenario_account_statement_bank_account.rst |  8 ++---
 ...ount_statement_second_currency_invoice.rst | 10 +++---
 .../tests/scenario_statement_origin.rst       | 16 +++------
 .../scenario_statement_origin_invoices.rst    | 16 +++------
 .../scenario_account_statement_aeb43.rst      | 19 +++++++----
 .../tests/scenario_account_statement_coda.rst | 15 ++++----
 .../scenario_account_statement_mt940.rst      | 13 +++----
 .../tests/scenario_account_statement_ofx.rst  | 15 ++++----
 .../tests/scenario_account_statement_rule.rst | 11 +++---
 ...nt_statement_rule_keyword_bank_account.rst | 14 ++++----
 ...enario_account_statement_rule_keywords.rst | 13 ++++---
 .../tests/scenario_account_statement_sepa.rst | 15 ++++----
 .../scenario_account_stock_anglo_saxon.rst    | 18 ++++------
 ...t_stock_anglo_saxon_with_drop_shipment.rst | 18 ++++------
 .../scenario_account_stock_continental.rst    | 17 ++++------
 .../scenario_account_stock_landed_cost.rst    | 13 ++++---
 ...nario_account_stock_landed_cost_weight.rst | 13 ++++---
 .../scenario_account_stock_shipment_cost.rst  | 13 ++++---
 ...rio_account_stock_shipment_cost_weight.rst | 13 ++++---
 .../tests/scenario_account_tax_cash.rst       | 16 +++------
 ...scenario_account_tax_cash_period_close.rst | 16 +++------
 ...enario_account_tax_cash_reconciliation.rst | 16 +++------
 .../scenario_account_tax_cash_supplier.rst    | 16 +++------
 .../scenario_account_tax_non_deductible.rst   | 17 ++++------
 .../tests/scenario_analytic_account.rst       | 22 +++++-------
 .../tests/scenario_analytic_budget.rst        | 16 +++------
 .../tests/scenario_analytic_invoice.rst       | 16 +++------
 .../tests/scenario_analytic_invoice_asset.rst | 18 ++++------
 .../tests/scenario_analytic_invoice_defer.rst | 18 ++++------
 .../tests/scenario_analytic_purchase.rst      | 16 +++------
 .../tests/scenario_analytic_sale.rst          | 16 +++------
 .../tests/scenario_carrier_carriage.rst       | 16 ++++-----
 ...percentage_with_purchase_shipment_cost.rst | 13 ++++---
 .../tests/scenario_carrier_subdivision.rst    | 10 ++----
 ...enario_carrier_subdivision_postal_code.rst | 10 ++----
 .../tests/scenario_carrier_weight.rst         | 13 ++++---
 .../tests/scenario_agent_selection.rst        | 10 +++---
 .../commission/tests/scenario_commission.rst  | 12 +++----
 ...nario_commission_credit_posted_invoice.rst | 12 +++----
 .../tests/scenario_commission_stock.rst       | 13 ++++---
 .../tests/scenario_commission_waiting.rst     | 12 +++----
 modules/company/tests/tools.py                |  2 ++
 .../scenario_document_incoming_invoice.rst    | 10 ++----
 ...scenario_document_incoming_ocr_typless.rst | 19 ++++-------
 modules/incoterm/tests/scenario_incoterm.rst  |  9 +++--
 ...io_marketing_automation_unsubscribable.rst |  6 +---
 .../scenario_marketing_campaign_sale.rst      | 18 ++++------
 .../tests/scenario_product_variant.rst        |  6 +---
 .../tests/scenario_product_cost_fifo.rst      |  5 ++-
 .../scenario_product_cost_fifo_no_in.rst      |  5 ++-
 ...product_cost_fifo_recompute_cost_price.rst |  5 ++-
 ...t_fifo_recompute_cost_price_production.rst |  5 ++-
 .../tests/scenario_product_cost_fifo_uom.rst  |  5 ++-
 .../tests/scenario_product_cost_history.rst   |  5 ++-
 .../scenario_account_stock_continental.rst    | 13 ++++---
 .../scenario_product_cost_fifo_warehouse.rst  |  5 ++-
 .../tests/scenario_product_cost_warehouse.rst |  5 ++-
 .../tests/scenario_product_kit.rst            |  5 ++-
 .../tests/scenario_product_kit_duplicate.rst  |  6 +---
 .../tests/scenario_product_kit_purchase.rst   | 17 ++++------
 .../tests/scenario_product_kit_sale.rst       | 18 ++++------
 .../production/tests/scenario_production.rst  |  9 ++---
 .../tests/scenario_production_by_product.rst  |  9 ++---
 .../tests/scenario_production_lot_number.rst  |  9 ++---
 .../tests/scenario_production_lot_trace.rst   |  9 ++---
 .../scenario_production_no_list_price.rst     |  9 ++---
 .../tests/scenario_production_rounding.rst    |  9 ++---
 .../tests/scenario_production_set_cost.rst    | 13 +++----
 .../tests/scenario_production_waste.rst       | 11 ++----
 .../tests/scenario_production_outsourcing.rst | 15 +++-----
 .../scenario_stock_supply_production.rst      |  9 ++---
 .../tests/scenario_production_split.rst       |  9 ++---
 .../tests/scenario_production_work.rst        |  9 ++---
 .../project/tests/scenario_project_status.rst |  6 +---
 .../tests/scenario_project_invoice_effort.rst | 15 +++-----
 ...cenario_project_invoice_multiple_party.rst | 14 +++-----
 .../scenario_project_invoice_progress.rst     | 15 +++-----
 .../scenario_project_invoice_timesheet.rst    | 15 +++-----
 .../tests/scenario_project_revenue.rst        | 10 ++----
 modules/purchase/tests/scenario_purchase.rst  | 16 +++------
 ...enario_purchase_copy_product_suppliers.rst |  9 ++---
 .../tests/scenario_purchase_default_taxes.rst |  9 ++---
 .../tests/scenario_purchase_empty.rst         | 13 ++-----
 .../scenario_purchase_line_cancelled.rst      |  9 ++---
 ...io_purchase_line_cancelled_on_shipment.rst |  9 ++---
 .../scenario_purchase_manual_invoice.rst      |  9 ++---
 .../tests/scenario_purchase_modify_header.rst | 16 +++------
 .../tests/scenario_purchase_reporting.rst     | 18 ++++------
 .../tests/scenario_purchase_return_wizard.rst | 17 +++-------
 .../tests/scenario_purchase_amendment.rst     | 17 +++-------
 .../scenario_purchase_blanket_agreement.rst   | 15 +++-----
 .../tests/scenario_purchase_history.rst       |  9 ++---
 ...o_purchase_invoice_line_not_standalone.rst | 10 ++----
 ...nario_purchase_invoice_line_standalone.rst | 18 ++++------
 .../tests/scenario_purchase_price_list.rst    |  6 +---
 .../scenario_purchase_product_quantity.rst    | 23 +++++--------
 .../tests/scenario_purchase_request.rst       | 29 +++++++---------
 .../scenario_purchase_request_quotation.rst   | 17 ++++------
 .../tests/scenario_purchase_requisition.rst   | 14 +++-----
 ...chase_blanket_agreement_secondary_unit.rst | 17 ++++------
 ...io_purchase_requisition_secondary_unit.rst | 15 +++-----
 .../scenario_purchase_secondary_unit.rst      | 15 +++-----
 .../tests/scenario_purchase_shipment_cost.rst | 19 ++++-------
 ...o_purchase_shipment_cost_invoice_stock.rst | 17 ++++------
 ...chase_shipment_cost_with_account_stock.rst | 25 ++++++--------
 ...nt_cost_with_account_stock_anglo_saxon.rst | 20 ++++-------
 .../scenario_quality_control_shipment.rst     |  6 +---
 .../tests/scenario_quality_inspection.rst     |  6 +---
 modules/sale/tests/scenario_sale.rst          | 17 +++-------
 .../tests/scenario_sale_default_methods.rst   |  9 ++---
 .../tests/scenario_sale_default_taxes.rst     |  9 ++---
 modules/sale/tests/scenario_sale_empty.rst    | 13 ++-----
 .../tests/scenario_sale_line_cancelled.rst    |  9 ++---
 ...cenario_sale_line_cancelled_on_invoice.rst |  9 ++---
 ...enario_sale_line_cancelled_on_shipment.rst |  9 ++---
 .../tests/scenario_sale_manual_invoice.rst    |  9 ++---
 .../tests/scenario_sale_manual_shipment.rst   |  6 +---
 .../tests/scenario_sale_modify_header.rst     | 16 +++------
 .../sale/tests/scenario_sale_reporting.rst    | 17 +++-------
 .../tests/scenario_advance_payment.rst        | 18 ++++------
 ...nario_sale_advance_payment_on_shipment.rst | 17 +++-------
 .../tests/scenario_sale_amendment.rst         | 17 +++-------
 .../tests/scenario_sale_blanket_agreement.rst | 15 +++-----
 .../tests/scenario_sale_complaint.rst         | 17 +++-------
 .../tests/scenario_sale_discount.rst          |  9 ++---
 .../sale_extra/tests/scenario_sale_extra.rst  | 14 +++-----
 .../tests/scenario_sale_gift_card.rst         | 14 +++-----
 .../tests/scenario_sale_gift_card_goods.rst   | 14 +++-----
 .../tests/scenario_sale_point_gift_card.rst   | 18 ++++------
 .../tests/scenario_sale_history.rst           |  9 ++---
 .../tests/scenario_sale_invoice_date.rst      | 16 +++------
 .../tests/scenario_sale_invoice_grouping.rst  | 18 ++++------
 ...cenario_sale_invoice_grouping_multiple.rst | 18 ++++------
 .../tests/scenario_sale_opportunity.rst       | 14 +++-----
 .../scenario_sale_opportunity_reporting.rst   |  9 ++---
 .../tests/scenario_sale_payment.rst           | 19 ++++-------
 .../scenario_sale_payment_no_clearing.rst     | 17 +++-------
 .../sale_point/tests/scenario_sale_point.rst  | 17 +++-------
 .../tests/scenario_sale_point_reporting.rst   | 17 +++-------
 .../tests/scenario_sale_point_return.rst      | 17 +++-------
 .../tests/scenario_sale_point_session.rst     | 17 +++-------
 .../scenario_sale_point_tax_excluded.rst      | 17 +++-------
 .../tests/scenario_sale_price_list.rst        | 17 +++-------
 .../scenario_sale_copy_product_customer.rst   |  9 ++---
 .../tests/scenario_sale_product_customer.rst  |  9 ++---
 .../tests/scenario_sale_product_quantity.rst  |  9 ++---
 .../scenario_sale_product_quantity_pos.rst    | 10 ++----
 ...roduct_recommendation_association_rule.rst | 11 +++---
 .../tests/scenario_sale_promotion.rst         | 14 +++-----
 .../tests/scenario_sale_promotion_amount.rst  | 12 +++----
 .../tests/scenario_sale_promotion_coupon.rst  | 15 +++-----
 ..._sale_blanket_agreement_secondary_unit.rst | 17 ++++------
 .../tests/scenario_sale_secondary_unit.rst    | 13 +++----
 .../tests/scenario_sale_shipment_cost.rst     | 22 +++++-------
 ...enario_sale_shipment_cost_modify_price.rst |  9 ++---
 .../scenario_sale_shipment_cost_promotion.rst | 18 ++++------
 .../scenario_sale_shipment_cost_stock.rst     | 15 +++-----
 .../tests/scenario_sale_shipment_grouping.rst | 18 ++++------
 ...enario_sale_shipment_grouping_multiple.rst | 18 ++++------
 ...scenario_sale_shipment_grouping_return.rst | 15 +++-----
 .../scenario_sale_over_shipment_tolerance.rst | 15 +++-----
 ...scenario_sale_under_shipment_tolerance.rst | 15 +++-----
 .../tests/scenario_sale_stock_quantity.rst    | 18 ++++------
 .../tests/scenario_sale_subscription.rst      | 14 +++-----
 ...rio_sale_subscription_advanced_invoice.rst | 14 +++-----
 .../scenario_sale_subscription_new_line.rst   | 14 +++-----
 .../scenario_sale_subscription_asset.rst      | 15 +++-----
 .../tests/scenario_sale_supply.rst            | 19 ++++-------
 .../scenario_sale_supply_notifications.rst    |  6 +---
 ...scenario_sale_supply_request_cancelled.rst |  9 ++---
 ...enario_sale_supply_shipment_on_invoice.rst | 17 +++-------
 .../scenario_sale_supply_stock_first.rst      |  9 ++---
 .../scenario_sale_supply_drop_shipment.rst    | 17 ++++------
 ...o_sale_supply_drop_shipment_on_invoice.rst | 18 ++++------
 ...ale_supply_drop_shipment_remaining_qty.rst | 18 ++++------
 ...enario_sale_supply_drop_shipment_split.rst | 10 ++----
 .../tests/scenario_sale_supply_production.rst | 15 +++-----
 ...cenario_sale_supply_production_routing.rst |  8 ++---
 ...rio_sale_supply_production_stock_first.rst | 10 ++----
 .../scenario_stock_average_cost_price.rst     | 34 +++++++------------
 .../stock/tests/scenario_stock_inventory.rst  | 22 +++++-------
 .../tests/scenario_stock_inventory_count.rst  |  9 ++---
 ...cenario_stock_inventory_empty_quantity.rst | 13 +++----
 .../tests/scenario_stock_move_in_future.rst   | 12 +++----
 ..._stock_product_quantities_by_warehouse.rst | 18 +++++-----
 ...rio_stock_recompute_average_cost_price.rst |  5 ++-
 ...ecompute_average_cost_price_production.rst | 14 ++++----
 .../stock/tests/scenario_stock_reporting.rst  | 20 ++++-------
 .../tests/scenario_stock_reporting_margin.rst | 20 +++++------
 .../scenario_stock_shipment_cron_assign.rst   | 14 ++++----
 .../tests/scenario_stock_shipment_in.rst      | 12 +++----
 .../scenario_stock_shipment_in_return.rst     | 13 +++----
 ...o_stock_shipment_in_same_storage_input.rst | 13 +++----
 .../scenario_stock_shipment_internal.rst      | 10 ++----
 ...enario_stock_shipment_internal_transit.rst |  9 ++---
 .../tests/scenario_stock_shipment_out.rst     | 24 +++++--------
 .../scenario_stock_shipment_out_return.rst    | 13 +++----
 ...shipment_out_return_same_storage_input.rst | 13 +++----
 ...stock_shipment_out_same_storage_output.rst | 13 +++----
 .../tests/scenario_stock_assign_manual.rst    | 18 ++++------
 .../tests/scenario_stock_consignment.rst      | 16 +++------
 ...io_stock_consignment_supplier_customer.rst | 14 +++-----
 .../tests/scenario_stock_inventories.rst      |  6 +---
 .../tests/scenario_stock_location_move.rst    |  9 ++---
 .../scenario_stock_location_move_empty.rst    |  5 ++-
 .../scenario_stock_location_move_supply.rst   | 11 +++---
 .../tests/scenario_stock_lot_assign_try.rst   | 15 +++-----
 .../scenario_stock_lot_inventory_count.rst    |  9 ++---
 .../tests/scenario_stock_lot_move_add.rst     | 12 +++----
 .../tests/scenario_stock_lot_shipment_in.rst  | 11 ++----
 .../tests/scenario_stock_lot_shipment_out.rst | 14 +++-----
 ...enario_stock_lot_shipment_out_internal.rst |  9 ++---
 .../tests/scenario_stock_lot_trace.rst        | 14 +++-----
 .../tests/scenario_stock_lot_unit.rst         | 22 ++++++------
 .../scenario_stock_lot_unit_move_add.rst      | 12 +++----
 .../tests/scenario_stock_package.rst          | 14 ++++----
 .../tests/scenario_shipping_dpd.rst           | 14 ++++----
 .../scenario_stock_package_shipping_mygls.rst | 14 ++++----
 ...nario_stock_package_shipping_sendcloud.rst | 14 ++++----
 .../tests/scenario_shipping_ups.rst           | 14 ++++----
 .../tests/scenario_product_copy_locations.rst |  9 ++---
 .../tests/scenario_stock_product_location.rst | 17 ++++------
 ...ario_stock_product_location_consumable.rst |  6 +---
 ...ario_stock_product_location_production.rst |  6 +---
 ...enario_stock_product_location_template.rst | 17 ++++------
 .../scenario_stock_product_location_place.rst |  6 +---
 ...ario_stock_product_location_place_copy.rst |  6 +---
 ...ck_product_location_place_modification.rst | 12 +++----
 ...scenario_stock_quantity_early_planning.rst | 21 ++++++------
 ...stock_quantity_early_planning_incoming.rst | 14 ++++----
 .../tests/scenario_stock_quantity_issue.rst   | 15 ++++----
 .../tests/scenario_stock_shipment_cost.rst    | 16 ++++-----
 .../scenario_stock_shipment_cost_weight.rst   | 14 ++++----
 .../tests/scenario_stock_split_shipment.rst   | 12 +++----
 .../tests/scenario_stock_internal_supply.rst  |  9 ++---
 ...enario_stock_internal_supply_lead_time.rst | 12 +++----
 ...cenario_stock_internal_supply_overflow.rst |  9 ++---
 ...scenario_stock_supply_purchase_request.rst | 19 ++++-------
 .../tests/scenario_stock_supply_forecast.rst  | 15 +++-----
 .../scenario_stock_supply_production.rst      |  9 ++---
 .../tests/scenario_web_shop_shopify.rst       | 18 ++++------
 ...enario_web_shop_shopify_secondary_unit.rst | 18 ++++------
 .../scenario_web_shop_vue_storefront.rst      | 16 +++------
 335 files changed, 1580 insertions(+), 3035 deletions(-)

diff --git a/modules/account/tests/scenario_account_active.rst b/modules/account/tests/scenario_account_active.rst
index b5a5d07190..b27aa01780 100644
--- a/modules/account/tests/scenario_account_active.rst
+++ b/modules/account/tests/scenario_account_active.rst
@@ -9,29 +9,24 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> Account = Model.get('account.account')
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[1]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> Account = Model.get('account.account')
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> cash = accounts['cash']
 
 Check active without start or end date::
diff --git a/modules/account/tests/scenario_account_reconcile.rst b/modules/account/tests/scenario_account_reconcile.rst
index e640695065..38b6544fee 100644
--- a/modules/account/tests/scenario_account_reconcile.rst
+++ b/modules/account/tests/scenario_account_reconcile.rst
@@ -9,35 +9,29 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> party_required = globals().get('party_required', True)
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Line = Model.get('account.move.line')
     >>> Move = Model.get('account.move')
     >>> Party = Model.get('party.party')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account/tests/scenario_account_reconcile_automatic.rst b/modules/account/tests/scenario_account_reconcile_automatic.rst
index 8e733215e9..d25730d2c2 100644
--- a/modules/account/tests/scenario_account_reconcile_automatic.rst
+++ b/modules/account/tests/scenario_account_reconcile_automatic.rst
@@ -9,33 +9,27 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Line = Model.get('account.move.line')
     >>> Move = Model.get('account.move')
     >>> Party = Model.get('party.party')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create parties::
 
diff --git a/modules/account/tests/scenario_account_reconciliation.rst b/modules/account/tests/scenario_account_reconciliation.rst
index 005705d2e1..97f0a73a9f 100644
--- a/modules/account/tests/scenario_account_reconciliation.rst
+++ b/modules/account/tests/scenario_account_reconciliation.rst
@@ -9,30 +9,24 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, assertTrue
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
     >>> GLLine = Model.get('account.general_ledger.line')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account/tests/scenario_account_reconciliation_alternate_currency.rst b/modules/account/tests/scenario_account_reconciliation_alternate_currency.rst
index 706200e4ff..83d7bcf799 100644
--- a/modules/account/tests/scenario_account_reconciliation_alternate_currency.rst
+++ b/modules/account/tests/scenario_account_reconciliation_alternate_currency.rst
@@ -17,7 +17,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
     >>> Configuration = Model.get('account.configuration')
     >>> Journal = Model.get('account.journal')
@@ -30,19 +30,14 @@ Create currencies::
     >>> usd = get_currency('USD')
     >>> eur = get_currency('EUR')
 
-Create company::
-
-    >>> _ = create_company(currency=usd)
-
 Create fiscal year::
 
     >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Configure currency exchange::
diff --git a/modules/account/tests/scenario_account_reconciliation_alternate_currency_write_off.rst b/modules/account/tests/scenario_account_reconciliation_alternate_currency_write_off.rst
index d2a0ac9eb6..2a62dcf3c3 100644
--- a/modules/account/tests/scenario_account_reconciliation_alternate_currency_write_off.rst
+++ b/modules/account/tests/scenario_account_reconciliation_alternate_currency_write_off.rst
@@ -17,7 +17,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
     >>> Configuration = Model.get('account.configuration')
     >>> Journal = Model.get('account.journal')
@@ -31,19 +31,14 @@ Create currencies::
     >>> usd = get_currency('USD')
     >>> eur = get_currency('EUR')
 
-Create company::
-
-    >>> _ = create_company(currency=usd)
-
 Create fiscal year::
 
     >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Configure currency exchange::
diff --git a/modules/account/tests/scenario_account_reconciliation_empty.rst b/modules/account/tests/scenario_account_reconciliation_empty.rst
index d0ef43858a..424f9689af 100644
--- a/modules/account/tests/scenario_account_reconciliation_empty.rst
+++ b/modules/account/tests/scenario_account_reconciliation_empty.rst
@@ -15,7 +15,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Move = Model.get('account.move')
@@ -25,18 +25,13 @@ Create currencies::
     >>> usd = get_currency('USD')
     >>> eur = get_currency('EUR')
 
-Create company::
-
-    >>> _ = create_company(currency=usd)
-
 Create fiscal year::
 
     >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
     >>> account = accounts['cash']
     >>> account.reconcile = True
diff --git a/modules/account/tests/scenario_close_fiscalyear.rst b/modules/account/tests/scenario_close_fiscalyear.rst
index 59b80d6526..bdd2da0aac 100644
--- a/modules/account/tests/scenario_close_fiscalyear.rst
+++ b/modules/account/tests/scenario_close_fiscalyear.rst
@@ -12,7 +12,7 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
@@ -20,7 +20,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
     >>> Account = Model.get('account.account')
     >>> AccountType = Model.get('account.account.type')
@@ -31,21 +31,15 @@ Activate modules::
     >>> Period = Model.get('account.period')
     >>> Sequence = Model.get('ir.sequence')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company, today=last_year)
+    >>> fiscalyear = create_fiscalyear(today=last_year)
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Prepare the closing settings for fiscalyear close::
 
diff --git a/modules/account/tests/scenario_move_cancel.rst b/modules/account/tests/scenario_move_cancel.rst
index e5ccad44b9..10dc1e4a6f 100644
--- a/modules/account/tests/scenario_move_cancel.rst
+++ b/modules/account/tests/scenario_move_cancel.rst
@@ -9,31 +9,25 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
     >>> Reconciliation = Model.get('account.move.reconciliation')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
 
diff --git a/modules/account/tests/scenario_move_copy.rst b/modules/account/tests/scenario_move_copy.rst
index 2cd82595b0..bbc38207b2 100644
--- a/modules/account/tests/scenario_move_copy.rst
+++ b/modules/account/tests/scenario_move_copy.rst
@@ -15,25 +15,20 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Move = Model.get('account.move')
     >>> Party = Model.get('party.party')
 
-Create a company::
-
-    >>> _ = create_company()
-
 Create a fiscal year::
 
     >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create a chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create a party::
diff --git a/modules/account/tests/scenario_move_line_delegate.rst b/modules/account/tests/scenario_move_line_delegate.rst
index 9b556a783a..39a4de05e5 100644
--- a/modules/account/tests/scenario_move_line_delegate.rst
+++ b/modules/account/tests/scenario_move_line_delegate.rst
@@ -9,35 +9,32 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Move = Model.get('account.move')
     >>> Party = Model.get('party.party')
 
-Create company::
+Get currencies::
 
     >>> usd = get_currency('USD')
     >>> eur = get_currency('EUR')
-    >>> _ = create_company(currency=usd)
-    >>> company = get_company()
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create parties::
 
diff --git a/modules/account/tests/scenario_move_line_group.rst b/modules/account/tests/scenario_move_line_group.rst
index dc7f4040b8..4b27f2d1fc 100644
--- a/modules/account/tests/scenario_move_line_group.rst
+++ b/modules/account/tests/scenario_move_line_group.rst
@@ -11,31 +11,28 @@ Imports::
     >>> from trytond.modules.account.exceptions import CancelDelegatedWarning
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
-Create company::
+Get currency::
 
     >>> usd = get_currency('USD')
     >>> eur = get_currency('EUR')
-    >>> _ = create_company(currency=usd)
-    >>> company = get_company()
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> payable = accounts['payable']
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
diff --git a/modules/account/tests/scenario_move_line_reschedule.rst b/modules/account/tests/scenario_move_line_reschedule.rst
index b82ae17442..2cbcc615bb 100644
--- a/modules/account/tests/scenario_move_line_reschedule.rst
+++ b/modules/account/tests/scenario_move_line_reschedule.rst
@@ -11,36 +11,33 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Line = Model.get('account.move.line')
     >>> Move = Model.get('account.move')
     >>> Party = Model.get('party.party')
 
-Create company::
+Get currencies::
 
     >>> usd = get_currency('USD')
     >>> eur = get_currency('EUR')
-    >>> _ = create_company(currency=usd)
-    >>> company = get_company()
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
 
diff --git a/modules/account/tests/scenario_move_template.rst b/modules/account/tests/scenario_move_template.rst
index 7aa9a3b5fd..a4c15e6731 100644
--- a/modules/account/tests/scenario_move_template.rst
+++ b/modules/account/tests/scenario_move_template.rst
@@ -10,7 +10,7 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, create_tax, create_tax_code, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import (
     ...     activate_modules, assertEqual, assertGreaterEqual, assertLessEqual)
 
@@ -18,23 +18,17 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period_ids = [p.id for p in fiscalyear.periods]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> payable = accounts['payable']
     >>> expense = accounts['expense']
     >>> tax = accounts['tax']
diff --git a/modules/account/tests/scenario_renew_fiscalyear.rst b/modules/account/tests/scenario_renew_fiscalyear.rst
index 4af15ee263..9662c559a7 100644
--- a/modules/account/tests/scenario_renew_fiscalyear.rst
+++ b/modules/account/tests/scenario_renew_fiscalyear.rst
@@ -6,21 +6,16 @@ Imports::
 
     >>> from proteus import Wizard
     >>> from trytond.modules.account.tests.tools import create_fiscalyear
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('account')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account', create_company)
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods.new()
     >>> period.name = 'Adjustment'
diff --git a/modules/account/tests/scenario_reports.rst b/modules/account/tests/scenario_reports.rst
index 4f1f64b598..e2b63f60e0 100644
--- a/modules/account/tests/scenario_reports.rst
+++ b/modules/account/tests/scenario_reports.rst
@@ -17,24 +17,20 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account')
+    >>> config = activate_modules('account', create_company, create_chart)
 
-Create company::
-
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company, today)
+    >>> fiscalyear = create_fiscalyear(today=today)
     >>> fiscalyear.click('create_period')
     >>> periods = fiscalyear.periods
     >>> period_1, period_3, period_5 = periods[0], periods[2], periods[4]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account/tests/scenario_tax_code.rst b/modules/account/tests/scenario_tax_code.rst
index 41ef664db3..6b71921d58 100644
--- a/modules/account/tests/scenario_tax_code.rst
+++ b/modules/account/tests/scenario_tax_code.rst
@@ -9,28 +9,22 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, create_tax, create_tax_code, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create tax code::
 
diff --git a/modules/account_asset/tests/scenario_account_asset.rst b/modules/account_asset/tests/scenario_account_asset.rst
index 1d620901eb..99a75133b8 100644
--- a/modules/account_asset/tests/scenario_account_asset.rst
+++ b/modules/account_asset/tests/scenario_account_asset.rst
@@ -14,28 +14,22 @@ Imports::
     >>> from trytond.modules.account_asset.tests.tools import add_asset_accounts
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('account_asset')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_asset', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_asset_accounts(get_accounts(company), company)
+    >>> accounts = add_asset_accounts(get_accounts())
     >>> revenue = accounts['revenue']
     >>> asset_account = accounts['asset']
     >>> expense = accounts['expense']
diff --git a/modules/account_asset/tests/scenario_account_asset_depreciated.rst b/modules/account_asset/tests/scenario_account_asset_depreciated.rst
index 2b190233fb..e95604cf4e 100644
--- a/modules/account_asset/tests/scenario_account_asset_depreciated.rst
+++ b/modules/account_asset/tests/scenario_account_asset_depreciated.rst
@@ -14,28 +14,22 @@ Imports::
     >>> from trytond.modules.account_asset.tests.tools import add_asset_accounts
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_asset')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_asset', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_asset_accounts(get_accounts(company), company)
+    >>> accounts = add_asset_accounts(get_accounts())
     >>> revenue = accounts['revenue']
     >>> asset_account = accounts['asset']
     >>> expense = accounts['expense']
diff --git a/modules/account_asset/tests/scenario_purchase_asset.rst b/modules/account_asset/tests/scenario_purchase_asset.rst
index c7d3aed8eb..28d312bb35 100644
--- a/modules/account_asset/tests/scenario_purchase_asset.rst
+++ b/modules/account_asset/tests/scenario_purchase_asset.rst
@@ -12,28 +12,23 @@ Imports::
     >>> from trytond.modules.account_asset.tests.tools import add_asset_accounts
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules(['account_asset', 'purchase'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     ['account_asset', 'purchase'], create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_asset_accounts(get_accounts(company), company)
+    >>> accounts = add_asset_accounts(get_accounts())
     >>> revenue = accounts['revenue']
     >>> asset_account = accounts['asset']
     >>> expense = accounts['expense']
diff --git a/modules/account_budget/tests/scenario_account_budget.rst b/modules/account_budget/tests/scenario_account_budget.rst
index 5beb53d649..f7aa738a5a 100644
--- a/modules/account_budget/tests/scenario_account_budget.rst
+++ b/modules/account_budget/tests/scenario_account_budget.rst
@@ -9,12 +9,12 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_budget')
+    >>> config = activate_modules('account_budget', create_company, create_chart)
 
     >>> Account = Model.get('account.account')
     >>> Budget = Model.get('account.budget')
@@ -23,14 +23,9 @@ Activate modules::
     >>> Move = Model.get('account.move')
     >>> Party = Model.get('party.party')
 
-Create a company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create a fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
@@ -38,10 +33,9 @@ Create a fiscal year::
     >>> renew_fiscalyear.execute('create_')
     >>> next_fiscalyear, = renew_fiscalyear.actions[0]
 
-Create a chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create the parties::
 
diff --git a/modules/account_cash_rounding/tests/scenario_account_cash_rounding.rst b/modules/account_cash_rounding/tests/scenario_account_cash_rounding.rst
index 0d917bf704..b63ebbb2ce 100644
--- a/modules/account_cash_rounding/tests/scenario_account_cash_rounding.rst
+++ b/modules/account_cash_rounding/tests/scenario_account_cash_rounding.rst
@@ -11,30 +11,27 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules(['account_cash_rounding', 'account_invoice'])
+    >>> config = activate_modules(
+    ...     ['account_cash_rounding', 'account_invoice'], create_company, create_chart)
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> Account = Model.get('account.account')
+    >>> AccountConfig = Model.get('account.configuration')
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> Account = Model.get('account.account')
-    >>> AccountConfig = Model.get('account.configuration')
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Set cash rounding::
 
@@ -52,7 +49,7 @@ Set cash rounding::
     >>> account_config.cash_rounding_debit_account = cash_rounding_debit
     >>> account_config.save()
 
-    >>> currency = company.currency
+    >>> currency = get_currency()
     >>> currency.cash_rounding = Decimal('0.05')
     >>> currency.save()
 
diff --git a/modules/account_cash_rounding/tests/scenario_account_cash_rounding_alternate_currency.rst b/modules/account_cash_rounding/tests/scenario_account_cash_rounding_alternate_currency.rst
index 597315b0b3..c2a03b43af 100644
--- a/modules/account_cash_rounding/tests/scenario_account_cash_rounding_alternate_currency.rst
+++ b/modules/account_cash_rounding/tests/scenario_account_cash_rounding_alternate_currency.rst
@@ -11,14 +11,17 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules(['account_cash_rounding', 'account_invoice'])
+    >>> config = activate_modules(
+    ...     ['account_cash_rounding', 'account_invoice'], create_company, create_chart)
 
+    >>> Account = Model.get('account.account')
+    >>> AccountConfig = Model.get('account.configuration')
     >>> Configuration = Model.get('account.configuration')
 
 Set alternate currencies::
@@ -26,23 +29,15 @@ Set alternate currencies::
     >>> currency = get_currency('USD')
     >>> eur = get_currency('EUR')
 
-Create company::
-
-    >>> _ = create_company(currency=currency)
-    >>> company = get_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> Account = Model.get('account.account')
-    >>> AccountConfig = Model.get('account.configuration')
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Configure currency exchange::
 
diff --git a/modules/account_cash_rounding/tests/scenario_account_cash_rounding_purchase.rst b/modules/account_cash_rounding/tests/scenario_account_cash_rounding_purchase.rst
index b1b840d222..d0aded87a3 100644
--- a/modules/account_cash_rounding/tests/scenario_account_cash_rounding_purchase.rst
+++ b/modules/account_cash_rounding/tests/scenario_account_cash_rounding_purchase.rst
@@ -9,25 +9,22 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
     >>> from trytond.modules.account_invoice.tests.tools import create_payment_term
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['account_cash_rounding', 'account_invoice', 'purchase'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
+    ...     ['account_cash_rounding', 'account_invoice', 'purchase'],
+    ...     create_company, create_chart)
 
     >>> Account = Model.get('account.account')
     >>> AccountConfig = Model.get('account.configuration')
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+
+Get accounts::
+
+    >>> accounts = get_accounts()
 
     >>> Configuration = Model.get('account.configuration')
     >>> config = Configuration(1)
@@ -36,7 +33,7 @@ Create chart of accounts::
 
 Set cash rounding::
 
-    >>> currency = company.currency
+    >>> currency = get_currency()
     >>> currency.cash_rounding = Decimal('0.05')
     >>> currency.save()
 
diff --git a/modules/account_cash_rounding/tests/scenario_account_cash_rounding_sale.rst b/modules/account_cash_rounding/tests/scenario_account_cash_rounding_sale.rst
index c2d0076165..c5109c4a62 100644
--- a/modules/account_cash_rounding/tests/scenario_account_cash_rounding_sale.rst
+++ b/modules/account_cash_rounding/tests/scenario_account_cash_rounding_sale.rst
@@ -9,25 +9,22 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
     >>> from trytond.modules.account_invoice.tests.tools import create_payment_term
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['account_cash_rounding', 'account_invoice', 'sale'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
+    ...     ['account_cash_rounding', 'account_invoice', 'sale'],
+    ...     create_company, create_chart)
 
     >>> Account = Model.get('account.account')
     >>> AccountConfig = Model.get('account.configuration')
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+
+Get accounts::
+
+    >>> accounts = get_accounts()
 
 Set cash rounding::
 
@@ -45,7 +42,7 @@ Set cash rounding::
     >>> account_config.cash_rounding_debit_account = cash_rounding_debit
     >>> account_config.save()
 
-    >>> currency = company.currency
+    >>> currency = get_currency()
     >>> currency.cash_rounding = Decimal('0.05')
     >>> currency.save()
 
diff --git a/modules/account_deposit/tests/scenario_deposit.rst b/modules/account_deposit/tests/scenario_deposit.rst
index 1b528f9283..b34cf42581 100644
--- a/modules/account_deposit/tests/scenario_deposit.rst
+++ b/modules/account_deposit/tests/scenario_deposit.rst
@@ -12,28 +12,22 @@ Imports::
     >>> from trytond.modules.account_deposit.tests.tools import add_deposit_accounts
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_deposit')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_deposit', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_deposit_accounts(get_accounts(company))
+    >>> accounts = add_deposit_accounts(get_accounts())
 
 Create party::
 
diff --git a/modules/account_deposit/tests/scenario_deposit_second_currency.rst b/modules/account_deposit/tests/scenario_deposit_second_currency.rst
index 7f75c5196d..1273f9dd4c 100644
--- a/modules/account_deposit/tests/scenario_deposit_second_currency.rst
+++ b/modules/account_deposit/tests/scenario_deposit_second_currency.rst
@@ -22,16 +22,15 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_deposit')
+    >>> config = activate_modules('account_deposit', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> Invoice = Model.get('account.invoice')
 
-Create company::
+Get currencies::
 
     >>> currency = get_currency('USD')
     >>> eur = get_currency('EUR')
-    >>> _ = create_company(currency=currency)
 
 Set alternate currency rates::
 
@@ -48,9 +47,8 @@ Create fiscal year::
     >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = add_deposit_accounts(get_accounts())
     >>> accounts['deposit'].second_currency = eur
     >>> accounts['deposit'].save()
diff --git a/modules/account_dunning/tests/scenario_account_dunning.rst b/modules/account_dunning/tests/scenario_account_dunning.rst
index 12e2723dae..a2e8f17ece 100644
--- a/modules/account_dunning/tests/scenario_account_dunning.rst
+++ b/modules/account_dunning/tests/scenario_account_dunning.rst
@@ -12,7 +12,7 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import (
     ...     activate_modules, assertEqual, assertTrue, set_user)
 
@@ -20,12 +20,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_dunning')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_dunning', create_company, create_chart)
 
 Create account admin user::
 
@@ -62,14 +57,13 @@ Create dunning user::
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> cash = accounts['cash']
diff --git a/modules/account_dunning/tests/scenario_account_dunning_final.rst b/modules/account_dunning/tests/scenario_account_dunning_final.rst
index dbbfec1dfa..8d81a617ed 100644
--- a/modules/account_dunning/tests/scenario_account_dunning_final.rst
+++ b/modules/account_dunning/tests/scenario_account_dunning_final.rst
@@ -10,28 +10,22 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_dunning')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_dunning', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
 Create chart of accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> cash = accounts['cash']
diff --git a/modules/account_dunning_email/tests/scenario_account_dunning_email.rst b/modules/account_dunning_email/tests/scenario_account_dunning_email.rst
index 4fe4adced0..bef9da88c8 100644
--- a/modules/account_dunning_email/tests/scenario_account_dunning_email.rst
+++ b/modules/account_dunning_email/tests/scenario_account_dunning_email.rst
@@ -12,7 +12,7 @@ Imports::
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_dunning_email import account
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Patch send_message_transactional::
@@ -24,25 +24,20 @@ Patch send_message_transactional::
 
 Activate modules::
 
-    >>> config = activate_modules('account_dunning_email')
+    >>> config = activate_modules(
+    ...     'account_dunning_email', create_company, create_chart)
 
     >>> Email = Model.get('ir.email')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> cash = accounts['cash']
diff --git a/modules/account_dunning_fee/tests/scenario_account_dunning_fee.rst b/modules/account_dunning_fee/tests/scenario_account_dunning_fee.rst
index aba2258dbb..43581a9d69 100644
--- a/modules/account_dunning_fee/tests/scenario_account_dunning_fee.rst
+++ b/modules/account_dunning_fee/tests/scenario_account_dunning_fee.rst
@@ -10,17 +10,12 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_dunning_fee')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_dunning_fee', create_company, create_chart)
 
 Reload the context::
 
@@ -30,14 +25,13 @@ Reload the context::
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> Journal = Model.get('account.journal')
diff --git a/modules/account_dunning_letter/tests/scenario_account_dunning_letter.rst b/modules/account_dunning_letter/tests/scenario_account_dunning_letter.rst
index d5e9d5dfd1..e0e5a175cd 100644
--- a/modules/account_dunning_letter/tests/scenario_account_dunning_letter.rst
+++ b/modules/account_dunning_letter/tests/scenario_account_dunning_letter.rst
@@ -10,17 +10,13 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, set_user
 
 Activate modules::
 
-    >>> config = activate_modules('account_dunning_letter')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     'account_dunning_letter', create_company, create_chart)
 
 Reload the context::
 
@@ -61,14 +57,13 @@ Create dunning user::
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> cash = accounts['cash']
diff --git a/modules/account_es/tests/scenario_ec_operation_list.rst b/modules/account_es/tests/scenario_ec_operation_list.rst
index 64599ad17a..a21715a40d 100644
--- a/modules/account_es/tests/scenario_ec_operation_list.rst
+++ b/modules/account_es/tests/scenario_ec_operation_list.rst
@@ -5,6 +5,7 @@ Account ES EC Operation List Scenario
 Imports::
 
     >>> from decimal import Decimal
+    >>> from functools import partial
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
@@ -16,11 +17,12 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_es')
+    >>> config = activate_modules(
+    ...     'account_es',
+    ...     create_company, partial(create_chart, chart='account_es.pgc_0_pyme'))
 
-Create company::
+Setup company::
 
-    >>> _ = create_company()
     >>> company = get_company()
     >>> tax_identifier = company.party.identifiers.new()
     >>> tax_identifier.type = 'eu_vat'
@@ -30,14 +32,13 @@ Create company::
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company, 'account_es.pgc_0_pyme')
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
     >>> revenue = accounts['revenue']
 
diff --git a/modules/account_es/tests/scenario_reporting.rst b/modules/account_es/tests/scenario_reporting.rst
index 672a6f5409..9bef80f5c6 100644
--- a/modules/account_es/tests/scenario_reporting.rst
+++ b/modules/account_es/tests/scenario_reporting.rst
@@ -6,6 +6,7 @@ Imports::
 
     >>> import datetime as dt
     >>> from decimal import Decimal
+    >>> from functools import partial
 
     >>> from proteus import Model, Report, Wizard
     >>> from trytond.modules.account.tests.tools import (
@@ -18,11 +19,12 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_es')
+    >>> config = activate_modules(
+    ...     'account_es',
+    ...     create_company, partial(create_chart, chart='account_es.pgc_0_pyme'))
 
-Create company::
+Setup company::
 
-    >>> _ = create_company()
     >>> company = get_company()
     >>> tax_identifier = company.party.identifiers.new()
     >>> tax_identifier.type = 'eu_vat'
@@ -35,14 +37,13 @@ Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
     ...     create_fiscalyear(
-    ...         company, (dt.date(2018, 1, 1), dt.date(2018, 12, 31))))
+    ...         today=(dt.date(2018, 1, 1), dt.date(2018, 12, 31))))
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company, 'account_es.pgc_0_pyme')
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
     >>> revenue = accounts['revenue']
 
diff --git a/modules/account_es/tests/scenario_reporting_alternate_currency.rst b/modules/account_es/tests/scenario_reporting_alternate_currency.rst
index 380b0be740..9270d59cbe 100644
--- a/modules/account_es/tests/scenario_reporting_alternate_currency.rst
+++ b/modules/account_es/tests/scenario_reporting_alternate_currency.rst
@@ -6,6 +6,7 @@ Imports::
 
     >>> import datetime as dt
     >>> from decimal import Decimal
+    >>> from functools import partial
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import (
@@ -20,25 +21,25 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_es')
+    >>> config = activate_modules(
+    ...     'account_es',
+    ...     create_company, partial(create_chart, chart='account_es.pgc_0_pyme'))
 
-Create company::
+Get company::
 
     >>> currency = get_currency('USD')
     >>> eur = get_currency('EUR')
-    >>> _ = create_company(currency=currency)
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
 Create chart of accounts::
 
-    >>> _ = create_chart(company, 'account_es.pgc_0_pyme')
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
     >>> revenue = accounts['revenue']
 
diff --git a/modules/account_es/tests/scenario_reporting_cancelled_invoices.rst b/modules/account_es/tests/scenario_reporting_cancelled_invoices.rst
index 95ad434c16..9fb69e3873 100644
--- a/modules/account_es/tests/scenario_reporting_cancelled_invoices.rst
+++ b/modules/account_es/tests/scenario_reporting_cancelled_invoices.rst
@@ -5,6 +5,7 @@ Account ES Reporting Cancelled Invoices Scenario
 Imports::
 
     >>> from decimal import Decimal
+    >>> from functools import partial
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
@@ -16,11 +17,12 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_es')
+    >>> config = activate_modules(
+    ...     'account_es',
+    ...     create_company, partial(create_chart, chart='account_es.pgc_0_pyme'))
 
-Create company::
+Setup company::
 
-    >>> _ = create_company()
     >>> company = get_company()
     >>> tax_identifier = company.party.identifiers.new()
     >>> tax_identifier.type = 'eu_vat'
@@ -30,14 +32,13 @@ Create company::
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company, 'account_es.pgc_0_pyme')
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
     >>> revenue = accounts['revenue']
 
diff --git a/modules/account_es/tests/scenario_reporting_compensate.rst b/modules/account_es/tests/scenario_reporting_compensate.rst
index 71a91345a0..b93099886d 100644
--- a/modules/account_es/tests/scenario_reporting_compensate.rst
+++ b/modules/account_es/tests/scenario_reporting_compensate.rst
@@ -6,6 +6,7 @@ Imports::
 
     >>> import datetime as dt
     >>> from decimal import Decimal
+    >>> from functools import partial
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
@@ -18,11 +19,12 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules(['account_es', 'account_invoice'])
+    >>> config = activate_modules(
+    ...     ['account_es', 'account_invoice'],
+    ...     create_company, partial(create_chart, chart='account_es.pgc_0_pyme'))
 
-Create company::
+Setup company::
 
-    >>> _ = create_company()
     >>> company = get_company()
     >>> tax_identifier = company.party.identifiers.new()
     >>> tax_identifier.type = 'eu_vat'
@@ -33,15 +35,14 @@ Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
     ...     create_fiscalyear(
-    ...         company, (dt.date(2018, 1, 1), dt.date(2018, 12, 31))))
+    ...         today=(dt.date(2018, 1, 1), dt.date(2018, 12, 31))))
     >>> fiscalyear.click('create_period')
     >>> previous_period = fiscalyear.periods[0]
     >>> period = fiscalyear.periods[1]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company, 'account_es.pgc_0_pyme')
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
     >>> revenue = accounts['revenue']
 
diff --git a/modules/account_es/tests/scenario_reporting_surcharge_tax.rst b/modules/account_es/tests/scenario_reporting_surcharge_tax.rst
index 6a1c4eafec..d838fbd05d 100644
--- a/modules/account_es/tests/scenario_reporting_surcharge_tax.rst
+++ b/modules/account_es/tests/scenario_reporting_surcharge_tax.rst
@@ -6,6 +6,7 @@ Imports::
 
     >>> import datetime as dt
     >>> from decimal import Decimal
+    >>> from functools import partial
 
     >>> from proteus import Model, Report
     >>> from trytond.modules.account.tests.tools import (
@@ -18,11 +19,12 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_es')
+    >>> config = activate_modules(
+    ...     'account_es',
+    ...     create_company, partial(create_chart, chart='account_es.pgc_0_pyme'))
 
-Create company::
+Setup company::
 
-    >>> _ = create_company()
     >>> company = get_company()
     >>> tax_identifier = company.party.identifiers.new()
     >>> tax_identifier.type = 'eu_vat'
@@ -36,10 +38,9 @@ Create fiscal year::
     ...         company, (dt.date(2020, 1, 1), dt.date(2020, 12, 31))))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company, 'account_es.pgc_0_pyme')
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
     >>> revenue = accounts['revenue']
 
diff --git a/modules/account_es_sii/tests/scenario_renew_fiscalyear.rst b/modules/account_es_sii/tests/scenario_renew_fiscalyear.rst
index 3f5d5e1857..778e7e3a06 100644
--- a/modules/account_es_sii/tests/scenario_renew_fiscalyear.rst
+++ b/modules/account_es_sii/tests/scenario_renew_fiscalyear.rst
@@ -8,21 +8,16 @@ Imports::
     >>> from trytond.modules.account.tests.tools import create_fiscalyear
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_es_sii')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_es_sii', create_company)
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear = set_fiscalyear_invoice_sequences(fiscalyear)
     >>> fiscalyear.click('create_period')
 
diff --git a/modules/account_export/tests/scenario_account_export.rst b/modules/account_export/tests/scenario_account_export.rst
index bc6cbabd9a..eb0d991240 100644
--- a/modules/account_export/tests/scenario_account_export.rst
+++ b/modules/account_export/tests/scenario_account_export.rst
@@ -14,26 +14,21 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_export')
+    >>> config = activate_modules('account_export', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Move = Model.get('account.move')
     >>> MoveExport = Model.get('account.move.export')
     >>> Party = Model.get('party.party')
 
-Create company::
-
-    >>> _ = create_company()
-
 Create fiscal year::
 
     >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create party::
diff --git a/modules/account_export_winbooks/tests/scenario_account_export_winbooks.rst b/modules/account_export_winbooks/tests/scenario_account_export_winbooks.rst
index ed31786d03..866c3dcd34 100644
--- a/modules/account_export_winbooks/tests/scenario_account_export_winbooks.rst
+++ b/modules/account_export_winbooks/tests/scenario_account_export_winbooks.rst
@@ -21,7 +21,8 @@ Imports::
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['account_export_winbooks', 'account_statement'])
+    ...     ['account_export_winbooks', 'account_statement'],
+    ...     create_company, create_chart)
     >>> config.skip_warning = True
 
     >>> Invoice = Model.get('account.invoice')
@@ -31,13 +32,8 @@ Activate modules::
     >>> Statement = Model.get('account.statement')
     >>> StatementJournal = Model.get('account.statement.journal')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
     >>> accounts['payable'].winbooks_code = '440000'
diff --git a/modules/account_fr/tests/scenario_fec.rst b/modules/account_fr/tests/scenario_fec.rst
index 6eb43ac720..7a02f85959 100644
--- a/modules/account_fr/tests/scenario_fec.rst
+++ b/modules/account_fr/tests/scenario_fec.rst
@@ -17,11 +17,10 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_fr')
+    >>> config = activate_modules('account_fr', create_company, create_chart)
 
-Create company::
+Setup company::
 
-    >>> _ = create_company()
     >>> company = get_company()
     >>> siren = company.party.identifiers.new(type='fr_siren')
     >>> siren.code = '820043784'
@@ -30,21 +29,20 @@ Create company::
 Create last year fiscal year::
 
     >>> fiscalyear_previous = create_fiscalyear(
-    ...     company, (dt.date(2017, 1, 1), dt.date(2017, 12, 31)))
+    ...     today=(dt.date(2017, 1, 1), dt.date(2017, 12, 31)))
     >>> fiscalyear_previous.click('create_period')
     >>> period_previous = fiscalyear_previous.periods[0]
 
 Create fiscal year::
 
     >>> fiscalyear = create_fiscalyear(
-    ...     company, (dt.date(2018, 1, 1), dt.date(2018, 12, 31)))
+    ...     today=(dt.date(2018, 1, 1), dt.date(2018, 12, 31)))
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account_fr_chorus/tests/scenario_account_fr_chorus_invoice.rst b/modules/account_fr_chorus/tests/scenario_account_fr_chorus_invoice.rst
index 5b314798a2..d6a1f377f0 100644
--- a/modules/account_fr_chorus/tests/scenario_account_fr_chorus_invoice.rst
+++ b/modules/account_fr_chorus/tests/scenario_account_fr_chorus_invoice.rst
@@ -9,6 +9,7 @@ Imports::
     >>> import time
     >>> import uuid
     >>> from decimal import Decimal
+    >>> from functools import partial
     >>> from unittest.mock import patch
 
     >>> from proteus import Model
@@ -17,7 +18,6 @@ Imports::
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
     >>> from trytond.modules.company.tests.tools import create_company, get_company
-    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.modules.party.party import Identifier
     >>> from trytond.tests.tools import activate_modules
 
@@ -32,7 +32,8 @@ Patch SIRET validation::
 Activate modules::
 
     >>> config = activate_modules([
-    ...     'account_fr_chorus', 'edocument_uncefact', 'account_fr'])
+    ...     'account_fr_chorus', 'edocument_uncefact', 'account_fr'],
+    ...     create_company, partial(create_chart, chart='account_fr.root'))
 
     >>> AccountConfig = Model.get('account.configuration')
     >>> Cron = Model.get('ir.cron')
@@ -41,9 +42,8 @@ Activate modules::
     >>> Party = Model.get('party.party')
     >>> Tax = Model.get('account.tax')
 
-Create company::
+Setup company::
 
-    >>> _ = create_company(currency=get_currency('EUR'))
     >>> company = get_company()
     >>> company_party = company.party
     >>> company_address, = company_party.addresses
@@ -60,9 +60,8 @@ Create fiscal year::
     >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(chart='account_fr.root')
     >>> acccounts = get_accounts()
 
     >>> tax, = Tax.find([
diff --git a/modules/account_invoice/tests/scenario_cancelling_invoice_move.rst b/modules/account_invoice/tests/scenario_cancelling_invoice_move.rst
index 22dfbf393f..fdc438b0be 100644
--- a/modules/account_invoice/tests/scenario_cancelling_invoice_move.rst
+++ b/modules/account_invoice/tests/scenario_cancelling_invoice_move.rst
@@ -12,12 +12,13 @@ Imports::
     >>> from trytond.modules.account_invoice.exceptions import CancelInvoiceMoveWarning
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
+
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
     >>> ProductUom = Model.get('product.uom')
@@ -25,21 +26,15 @@ Activate modules::
     >>> Invoice = Model.get('account.invoice')
     >>> Warning = Model.get('res.user.warning')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create party::
 
diff --git a/modules/account_invoice/tests/scenario_credit_note.rst b/modules/account_invoice/tests/scenario_credit_note.rst
index ba88c0127a..1d81ef2643 100644
--- a/modules/account_invoice/tests/scenario_credit_note.rst
+++ b/modules/account_invoice/tests/scenario_credit_note.rst
@@ -11,28 +11,22 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account_invoice/tests/scenario_invoice.rst b/modules/account_invoice/tests/scenario_invoice.rst
index 795c56d051..9371753017 100644
--- a/modules/account_invoice/tests/scenario_invoice.rst
+++ b/modules/account_invoice/tests/scenario_invoice.rst
@@ -19,11 +19,10 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
-Create company::
+Setup company::
 
-    >>> _ = create_company()
     >>> company = get_company()
     >>> tax_identifier = company.party.identifiers.new()
     >>> tax_identifier.type = 'eu_vat'
@@ -47,15 +46,14 @@ Set employee::
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
     >>> period_ids = [p.id for p in fiscalyear.periods]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account_invoice/tests/scenario_invoice_alternate_currency.rst b/modules/account_invoice/tests/scenario_invoice_alternate_currency.rst
index ebaf643e34..86941ebf70 100644
--- a/modules/account_invoice/tests/scenario_invoice_alternate_currency.rst
+++ b/modules/account_invoice/tests/scenario_invoice_alternate_currency.rst
@@ -13,7 +13,7 @@ Imports::
     >>> from trytond.modules.account_invoice.exceptions import InvoiceTaxesWarning
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
@@ -22,16 +22,14 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
     >>> Warning = Model.get('res.user.warning')
 
-Create company::
+Get currencies::
 
     >>> currency = get_currency('USD')
     >>> eur = get_currency('EUR')
-    >>> _ = create_company(currency=currency)
-    >>> company = get_company()
 
 Set alternate currency rates::
 
@@ -46,13 +44,12 @@ Set alternate currency rates::
 Create fiscal years::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, (today, tomorrow)))
+    ...     create_fiscalyear(today=(today, tomorrow)))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
     >>> account_tax = accounts['tax']
diff --git a/modules/account_invoice/tests/scenario_invoice_alternate_currency_exchange.rst b/modules/account_invoice/tests/scenario_invoice_alternate_currency_exchange.rst
index 1044431214..f861692422 100644
--- a/modules/account_invoice/tests/scenario_invoice_alternate_currency_exchange.rst
+++ b/modules/account_invoice/tests/scenario_invoice_alternate_currency_exchange.rst
@@ -20,18 +20,17 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
     >>> Configuration = Model.get('account.configuration')
     >>> Invoice = Model.get('account.invoice')
     >>> Party = Model.get('party.party')
     >>> PaymentTerm = Model.get('account.invoice.payment_term')
 
-Create company::
+Get currencies::
 
     >>> currency = get_currency('USD')
     >>> eur = get_currency('EUR')
-    >>> _ = create_company(currency=currency)
 
 Set alternate currency rates::
 
@@ -44,9 +43,8 @@ Create fiscal years::
     >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Configure currency exchange::
diff --git a/modules/account_invoice/tests/scenario_invoice_alternate_currency_lower_rate.rst b/modules/account_invoice/tests/scenario_invoice_alternate_currency_lower_rate.rst
index 649b43eb57..6f896c227a 100644
--- a/modules/account_invoice/tests/scenario_invoice_alternate_currency_lower_rate.rst
+++ b/modules/account_invoice/tests/scenario_invoice_alternate_currency_lower_rate.rst
@@ -12,7 +12,7 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
@@ -20,14 +20,12 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
-Create company::
+Get currencies::
 
     >>> currency = get_currency('USD')
     >>> eur = get_currency('EUR')
-    >>> _ = create_company(currency=currency)
-    >>> company = get_company()
 
 Set alternate currency rates::
 
@@ -39,13 +37,12 @@ Set alternate currency rates::
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create payment method::
 
diff --git a/modules/account_invoice/tests/scenario_invoice_alternate_currency_rate_change.rst b/modules/account_invoice/tests/scenario_invoice_alternate_currency_rate_change.rst
index 3fdfde0d59..dc05982906 100644
--- a/modules/account_invoice/tests/scenario_invoice_alternate_currency_rate_change.rst
+++ b/modules/account_invoice/tests/scenario_invoice_alternate_currency_rate_change.rst
@@ -21,7 +21,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
     >>> Configuration = Model.get('account.configuration')
     >>> Invoice = Model.get('account.invoice')
@@ -29,11 +29,10 @@ Activate modules::
     >>> Party = Model.get('party.party')
     >>> PaymentMethod = Model.get('account.invoice.payment.method')
 
-Create company::
+Get currencies::
 
     >>> currency = get_currency('USD')
     >>> eur = get_currency('EUR')
-    >>> _ = create_company(currency=currency)
 
 Set alternate currency rates::
 
@@ -51,9 +50,8 @@ Create fiscal year::
     ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Configure currency exchange::
diff --git a/modules/account_invoice/tests/scenario_invoice_alternative_payee.rst b/modules/account_invoice/tests/scenario_invoice_alternative_payee.rst
index 85d743a6c2..20f4529d96 100644
--- a/modules/account_invoice/tests/scenario_invoice_alternative_payee.rst
+++ b/modules/account_invoice/tests/scenario_invoice_alternative_payee.rst
@@ -11,33 +11,27 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
     >>> Invoice = Model.get('account.invoice')
     >>> Journal = Model.get('account.journal')
     >>> PaymentMethod = Model.get('account.invoice.payment.method')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
     >>> journal_cash, = Journal.find([
     ...         ('code', '=', 'CASH'),
diff --git a/modules/account_invoice/tests/scenario_invoice_customer_sequential.rst b/modules/account_invoice/tests/scenario_invoice_customer_sequential.rst
index 8f33ced055..d2869f704e 100644
--- a/modules/account_invoice/tests/scenario_invoice_customer_sequential.rst
+++ b/modules/account_invoice/tests/scenario_invoice_customer_sequential.rst
@@ -12,7 +12,7 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
@@ -20,27 +20,21 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
 Create fiscal years::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, past_year))
+    ...     create_fiscalyear(today=past_year))
     >>> fiscalyear.click('create_period')
 
     >>> renew_fiscalyear = Wizard('account.fiscalyear.renew')
     >>> renew_fiscalyear.execute('create_')
     >>> next_fiscalyear, = renew_fiscalyear.actions[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create party::
 
diff --git a/modules/account_invoice/tests/scenario_invoice_group_line.rst b/modules/account_invoice/tests/scenario_invoice_group_line.rst
index d92cc5eda4..71c215a8ee 100644
--- a/modules/account_invoice/tests/scenario_invoice_group_line.rst
+++ b/modules/account_invoice/tests/scenario_invoice_group_line.rst
@@ -11,29 +11,23 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> payable = accounts['payable']
     >>> revenue = accounts['revenue']
diff --git a/modules/account_invoice/tests/scenario_invoice_in_future.rst b/modules/account_invoice/tests/scenario_invoice_in_future.rst
index f9021d579d..81b18f114e 100644
--- a/modules/account_invoice/tests/scenario_invoice_in_future.rst
+++ b/modules/account_invoice/tests/scenario_invoice_in_future.rst
@@ -12,7 +12,7 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
@@ -20,23 +20,17 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, (today, tomorrow)))
+    ...     create_fiscalyear(today=(today, tomorrow)))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create party::
diff --git a/modules/account_invoice/tests/scenario_invoice_manual_tax.rst b/modules/account_invoice/tests/scenario_invoice_manual_tax.rst
index 5de8bedd0a..1a5c8cdaae 100644
--- a/modules/account_invoice/tests/scenario_invoice_manual_tax.rst
+++ b/modules/account_invoice/tests/scenario_invoice_manual_tax.rst
@@ -12,35 +12,29 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, create_tax_code, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
     >>> Invoice = Model.get('account.invoice')
     >>> Party = Model.get('party.party')
     >>> TaxCode = Model.get('account.tax.code')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
     >>> period_ids = [p.id for p in fiscalyear.periods]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create tax::
 
diff --git a/modules/account_invoice/tests/scenario_invoice_overpayment.rst b/modules/account_invoice/tests/scenario_invoice_overpayment.rst
index 4a405609bf..208ba8a2bf 100644
--- a/modules/account_invoice/tests/scenario_invoice_overpayment.rst
+++ b/modules/account_invoice/tests/scenario_invoice_overpayment.rst
@@ -11,28 +11,22 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
 Create fiscal years::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create payment method::
 
diff --git a/modules/account_invoice/tests/scenario_invoice_report_revision.rst b/modules/account_invoice/tests/scenario_invoice_report_revision.rst
index 62845979b9..26afa69503 100644
--- a/modules/account_invoice/tests/scenario_invoice_report_revision.rst
+++ b/modules/account_invoice/tests/scenario_invoice_report_revision.rst
@@ -12,14 +12,14 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
     >>> Invoice = Model.get('account.invoice')
     >>> Journal = Model.get('account.journal')
@@ -31,22 +31,16 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Sequence = Model.get('ir.sequence')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create party::
 
diff --git a/modules/account_invoice/tests/scenario_invoice_reschedule_lines.rst b/modules/account_invoice/tests/scenario_invoice_reschedule_lines.rst
index 42ddf6bf61..c5dc422320 100644
--- a/modules/account_invoice/tests/scenario_invoice_reschedule_lines.rst
+++ b/modules/account_invoice/tests/scenario_invoice_reschedule_lines.rst
@@ -11,33 +11,27 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
     >>> Invoice = Model.get('account.invoice')
     >>> Journal = Model.get('account.journal')
     >>> PaymentMethod = Model.get('account.invoice.payment.method')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
     >>> journal_cash, = Journal.find([
     ...         ('code', '=', 'CASH'),
diff --git a/modules/account_invoice/tests/scenario_invoice_supplier.rst b/modules/account_invoice/tests/scenario_invoice_supplier.rst
index ccb4bc8725..76b198c9be 100644
--- a/modules/account_invoice/tests/scenario_invoice_supplier.rst
+++ b/modules/account_invoice/tests/scenario_invoice_supplier.rst
@@ -12,31 +12,25 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, create_tax_code, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
     >>> period_ids = [p.id for p in fiscalyear.periods]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> payable = accounts['payable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account_invoice/tests/scenario_invoice_supplier_post_paid.rst b/modules/account_invoice/tests/scenario_invoice_supplier_post_paid.rst
index 0ac9d08943..5e8c68da6e 100644
--- a/modules/account_invoice/tests/scenario_invoice_supplier_post_paid.rst
+++ b/modules/account_invoice/tests/scenario_invoice_supplier_post_paid.rst
@@ -12,31 +12,25 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> payable = accounts['payable']
     >>> expense = accounts['expense']
     >>> cash = accounts['cash']
diff --git a/modules/account_invoice/tests/scenario_invoice_tax_deductible.rst b/modules/account_invoice/tests/scenario_invoice_tax_deductible.rst
index cafba570d2..e20dddb000 100644
--- a/modules/account_invoice/tests/scenario_invoice_tax_deductible.rst
+++ b/modules/account_invoice/tests/scenario_invoice_tax_deductible.rst
@@ -13,14 +13,14 @@ Imports::
     >>> from trytond.modules.account_invoice.exceptions import InvoiceTaxesWarning
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
     >>> Invoice = Model.get('account.invoice')
     >>> Party = Model.get('party.party')
@@ -29,21 +29,15 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Warning = Model.get('res.user.warning')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create tax::
 
diff --git a/modules/account_invoice/tests/scenario_invoice_with_credit.rst b/modules/account_invoice/tests/scenario_invoice_with_credit.rst
index 2cfc5b9400..259580cf6e 100644
--- a/modules/account_invoice/tests/scenario_invoice_with_credit.rst
+++ b/modules/account_invoice/tests/scenario_invoice_with_credit.rst
@@ -11,29 +11,23 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, create_tax_code, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_invoice', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
     >>> period_ids = [p.id for p in fiscalyear.periods]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create tax::
 
diff --git a/modules/account_invoice/tests/scenario_renew_fiscalyear.rst b/modules/account_invoice/tests/scenario_renew_fiscalyear.rst
index 6c97128f06..88ffa81bc5 100644
--- a/modules/account_invoice/tests/scenario_renew_fiscalyear.rst
+++ b/modules/account_invoice/tests/scenario_renew_fiscalyear.rst
@@ -10,24 +10,19 @@ Imports::
     >>> from trytond.modules.account.tests.tools import create_fiscalyear
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_invoice', create_company)
 
 Create fiscal year::
 
     >>> InvoiceSequence = Model.get('account.fiscalyear.invoice_sequence')
-    >>> fiscalyear = create_fiscalyear(company, today)
+    >>> fiscalyear = create_fiscalyear(today=today)
     >>> fiscalyear = set_fiscalyear_invoice_sequences(fiscalyear)
     >>> fiscalyear.click('create_period')
     >>> inv_seq, = fiscalyear.invoice_sequences
diff --git a/modules/account_invoice_correction/tests/scenario_invoice_correction.rst b/modules/account_invoice_correction/tests/scenario_invoice_correction.rst
index 33ddc519b3..72ba67787c 100644
--- a/modules/account_invoice_correction/tests/scenario_invoice_correction.rst
+++ b/modules/account_invoice_correction/tests/scenario_invoice_correction.rst
@@ -11,29 +11,23 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice_correction')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-    >>> company.party.save()
+    >>> config = activate_modules(
+    ...     'account_invoice_correction', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create party::
diff --git a/modules/account_invoice_defer/tests/scenario_account_invoice_defer.rst b/modules/account_invoice_defer/tests/scenario_account_invoice_defer.rst
index ee915409e8..5f08e3ba12 100644
--- a/modules/account_invoice_defer/tests/scenario_account_invoice_defer.rst
+++ b/modules/account_invoice_defer/tests/scenario_account_invoice_defer.rst
@@ -14,14 +14,15 @@ Imports::
     ...     set_fiscalyear_invoice_sequences)
     >>> from trytond.modules.account_invoice_defer.tests.tools import (
     ...     add_deferred_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice_defer')
+    >>> config = activate_modules(
+    ...     'account_invoice_defer', create_company, create_chart)
 
     >>> Invoice = Model.get('account.invoice')
     >>> InvoiceDeferred = Model.get('account.invoice.deferred')
@@ -29,22 +30,16 @@ Activate modules::
     >>> ProductCategory = Model.get('product.category')
     >>> ProductUom = Model.get('product.uom')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_deferred_accounts(get_accounts(company))
+    >>> accounts = add_deferred_accounts(get_accounts())
 
 Create party::
 
diff --git a/modules/account_invoice_stock/tests/scenario_account_invoice_stock.rst b/modules/account_invoice_stock/tests/scenario_account_invoice_stock.rst
index 3ac43ac677..1177ef996c 100644
--- a/modules/account_invoice_stock/tests/scenario_account_invoice_stock.rst
+++ b/modules/account_invoice_stock/tests/scenario_account_invoice_stock.rst
@@ -11,28 +11,24 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice_stock')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     'account_invoice_stock', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create a party::
 
@@ -81,7 +77,7 @@ Create a shipment::
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> move.unit_price = Decimal('40.0000')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> shipment.click('wait')
     >>> shipment.state
     'waiting'
diff --git a/modules/account_invoice_stock/tests/scenario_account_invoice_stock_correction.rst b/modules/account_invoice_stock/tests/scenario_account_invoice_stock_correction.rst
index 1c7c960895..47bd82ce5e 100644
--- a/modules/account_invoice_stock/tests/scenario_account_invoice_stock_correction.rst
+++ b/modules/account_invoice_stock/tests/scenario_account_invoice_stock_correction.rst
@@ -12,14 +12,16 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice_stock')
+    >>> config = activate_modules(
+    ...     'account_invoice_stock', create_company, create_chart)
 
     >>> Invoice = Model.get('account.invoice')
     >>> Location = Model.get('stock.location')
@@ -30,21 +32,15 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Shipment = Model.get('stock.shipment.in')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create a party::
 
@@ -86,7 +82,7 @@ Create a shipment::
     >>> move.from_location = supplier_loc
     >>> move.to_location = input_loc
     >>> move.unit_price = Decimal('40.0000')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> shipment.click('receive')
     >>> shipment.state
     'received'
diff --git a/modules/account_invoice_watermark/tests/scenario_account_invoice_watermark.rst b/modules/account_invoice_watermark/tests/scenario_account_invoice_watermark.rst
index ef00cf4f9a..97744160ae 100644
--- a/modules/account_invoice_watermark/tests/scenario_account_invoice_watermark.rst
+++ b/modules/account_invoice_watermark/tests/scenario_account_invoice_watermark.rst
@@ -12,12 +12,13 @@ Imports::
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
     >>> from trytond.modules.account_invoice_watermark.tests.tools import pdf_contains
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_invoice_watermark')
+    >>> config = activate_modules(
+    ...     'account_invoice_watermark', create_company, create_chart)
 
     >>> ActionReport = Model.get('ir.action.report')
     >>> Invoice = Model.get('account.invoice')
@@ -33,21 +34,15 @@ Convert invoice report to PDF::
     >>> invoice_report.extension = 'pdf'
     >>> invoice_report.save()
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create payment method::
 
diff --git a/modules/account_move_line_grouping/tests/scenario_account_move_line_grouping.rst b/modules/account_move_line_grouping/tests/scenario_account_move_line_grouping.rst
index 126099c3e2..b15c11b322 100644
--- a/modules/account_move_line_grouping/tests/scenario_account_move_line_grouping.rst
+++ b/modules/account_move_line_grouping/tests/scenario_account_move_line_grouping.rst
@@ -10,12 +10,13 @@ Imports::
     >>> from trytond import backend
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_move_line_grouping')
+    >>> config = activate_modules(
+    ...     'account_move_line_grouping', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Line = Model.get('account.move.line')
@@ -23,21 +24,15 @@ Activate modules::
     >>> Move = Model.get('account.move')
     >>> Party = Model.get('party.party')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
     >>> journal_revenue, = Journal.find([
     ...         ('code', '=', "REV"),
diff --git a/modules/account_payment/tests/scenario_account_payment.rst b/modules/account_payment/tests/scenario_account_payment.rst
index 98c75d0635..d78d5a671f 100644
--- a/modules/account_payment/tests/scenario_account_payment.rst
+++ b/modules/account_payment/tests/scenario_account_payment.rst
@@ -10,7 +10,7 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -18,12 +18,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_payment')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_payment', create_company, create_chart)
 
 Set employee::
 
@@ -41,13 +36,12 @@ Set employee::
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company, (today, tomorrow))
+    >>> fiscalyear = create_fiscalyear(today=(today, tomorrow))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> payable = accounts['payable']
     >>> expense = accounts['expense']
 
diff --git a/modules/account_payment/tests/scenario_account_payment_blocked_direct_debit.rst b/modules/account_payment/tests/scenario_account_payment_blocked_direct_debit.rst
index de36cf1171..58f6c25bb4 100644
--- a/modules/account_payment/tests/scenario_account_payment_blocked_direct_debit.rst
+++ b/modules/account_payment/tests/scenario_account_payment_blocked_direct_debit.rst
@@ -10,14 +10,14 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('account_payment')
+    >>> config = activate_modules('account_payment', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Line = Model.get('account.move.line')
@@ -26,20 +26,14 @@ Activate modules::
     >>> Payment = Model.get('account.payment')
     >>> PaymentJournal = Model.get('account.payment.journal')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
     >>> revnue_journal, = Journal.find([('code', '=', 'REV')])
 
diff --git a/modules/account_payment/tests/scenario_account_payment_direct_debit.rst b/modules/account_payment/tests/scenario_account_payment_direct_debit.rst
index 7e424a49bd..797f2d7266 100644
--- a/modules/account_payment/tests/scenario_account_payment_direct_debit.rst
+++ b/modules/account_payment/tests/scenario_account_payment_direct_debit.rst
@@ -10,7 +10,7 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, assertIsNotNone
 
     >>> today = dt.date.today()
@@ -19,7 +19,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_payment')
+    >>> config = activate_modules('account_payment', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Move = Model.get('account.move')
@@ -27,20 +27,14 @@ Activate modules::
     >>> Payment = Model.get('account.payment')
     >>> PaymentJournal = Model.get('account.payment.journal')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company, (today, after_tomorrow))
+    >>> fiscalyear = create_fiscalyear(today=(today, after_tomorrow))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
     >>> revnue_journal, = Journal.find([('code', '=', 'REV')])
 
diff --git a/modules/account_payment/tests/scenario_account_payment_direct_debit_balance.rst b/modules/account_payment/tests/scenario_account_payment_direct_debit_balance.rst
index 3c143093fd..debc3280bf 100644
--- a/modules/account_payment/tests/scenario_account_payment_direct_debit_balance.rst
+++ b/modules/account_payment/tests/scenario_account_payment_direct_debit_balance.rst
@@ -17,7 +17,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_payment')
+    >>> config = activate_modules('account_payment', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Move = Model.get('account.move')
@@ -25,18 +25,13 @@ Activate modules::
     >>> Payment = Model.get('account.payment')
     >>> PaymentJournal = Model.get('account.payment.journal')
 
-Create company::
-
-    >>> _ = create_company()
-
 Create fiscal year::
 
     >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
     >>> revnue_journal, = Journal.find([('code', '=', 'REV')])
diff --git a/modules/account_payment/tests/scenario_account_payment_dunning.rst b/modules/account_payment/tests/scenario_account_payment_dunning.rst
index 3b253535cd..d2c2386ef9 100644
--- a/modules/account_payment/tests/scenario_account_payment_dunning.rst
+++ b/modules/account_payment/tests/scenario_account_payment_dunning.rst
@@ -10,14 +10,15 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules(['account_payment', 'account_dunning'])
+    >>> config = activate_modules(
+    ...     ['account_payment', 'account_dunning'], create_company, create_chart)
 
     >>> Dunning = Model.get('account.dunning')
     >>> Journal = Model.get('account.journal')
@@ -26,21 +27,15 @@ Activate modules::
     >>> PaymentJournal = Model.get('account.payment.journal')
     >>> Procedure = Model.get('account.dunning.procedure')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
     >>> expense_journal, = Journal.find([('code', '=', 'EXP')])
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company, today)
+    >>> fiscalyear = create_fiscalyear(today=today)
     >>> fiscalyear.click('create_period')
 
 Create dunning procedure::
diff --git a/modules/account_payment/tests/scenario_account_payment_invoice.rst b/modules/account_payment/tests/scenario_account_payment_invoice.rst
index 00e901cba3..0cfbe322b6 100644
--- a/modules/account_payment/tests/scenario_account_payment_invoice.rst
+++ b/modules/account_payment/tests/scenario_account_payment_invoice.rst
@@ -11,28 +11,22 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules(['account_payment', 'account_invoice'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     ['account_payment', 'account_invoice'], create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> payable = accounts['payable']
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
diff --git a/modules/account_payment/tests/scenario_account_payment_planning.rst b/modules/account_payment/tests/scenario_account_payment_planning.rst
index 8b40ecd451..3041977370 100644
--- a/modules/account_payment/tests/scenario_account_payment_planning.rst
+++ b/modules/account_payment/tests/scenario_account_payment_planning.rst
@@ -10,7 +10,7 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -19,22 +19,16 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_payment')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_payment', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company, (today, next_week))
+    >>> fiscalyear = create_fiscalyear(today=(today, next_week))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> payable = accounts['payable']
     >>> expense = accounts['expense']
 
diff --git a/modules/account_payment/tests/scenario_account_payment_statement.rst b/modules/account_payment/tests/scenario_account_payment_statement.rst
index efecdcd6f3..ce42989039 100644
--- a/modules/account_payment/tests/scenario_account_payment_statement.rst
+++ b/modules/account_payment/tests/scenario_account_payment_statement.rst
@@ -19,7 +19,8 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules(['account_payment', 'account_statement'])
+    >>> config = activate_modules(
+    ...     ['account_payment', 'account_statement'], create_company, create_chart)
 
     >>> AccountJournal = Model.get('account.journal')
     >>> Party = Model.get('party.party')
@@ -28,19 +29,14 @@ Activate modules::
     >>> Statement = Model.get('account.statement')
     >>> StatementJournal = Model.get('account.statement.journal')
 
-Create company::
-
-    >>> _ = create_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
     ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create journals::
diff --git a/modules/account_payment/tests/scenario_account_payment_warnings.rst b/modules/account_payment/tests/scenario_account_payment_warnings.rst
index e74d22a44a..344457e6bb 100644
--- a/modules/account_payment/tests/scenario_account_payment_warnings.rst
+++ b/modules/account_payment/tests/scenario_account_payment_warnings.rst
@@ -10,14 +10,14 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('account_payment')
+    >>> config = activate_modules('account_payment', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Move = Model.get('account.move')
@@ -25,20 +25,14 @@ Activate modules::
     >>> Payment = Model.get('account.payment')
     >>> PaymentJournal = Model.get('account.payment.journal')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
     >>> expense_journal, = Journal.find([('code', '=', 'EXP')])
     >>> cash_journal, = Journal.find([('code', '=', 'CASH')])
diff --git a/modules/account_payment_braintree/tests/scenario_account_payment_braintree.rst b/modules/account_payment_braintree/tests/scenario_account_payment_braintree.rst
index dea608d2bd..2e0268adea 100644
--- a/modules/account_payment_braintree/tests/scenario_account_payment_braintree.rst
+++ b/modules/account_payment_braintree/tests/scenario_account_payment_braintree.rst
@@ -18,27 +18,23 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_payment_braintree')
+    >>> config = activate_modules(
+    ...     'account_payment_braintree', create_company, create_chart)
 
 Get cron::
 
     >>> Cron = Model.get('ir.cron')
 
-Create company::
+Get company::
 
     >>> Company = Model.get('company.company')
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-
 Create Braintree account::
 
     >>> BraintreeAccount = Model.get('account.payment.braintree.account')
diff --git a/modules/account_payment_clearing/tests/scenario_account_negative_payment_clearing.rst b/modules/account_payment_clearing/tests/scenario_account_negative_payment_clearing.rst
index 8477b54c20..6792c1cb55 100644
--- a/modules/account_payment_clearing/tests/scenario_account_negative_payment_clearing.rst
+++ b/modules/account_payment_clearing/tests/scenario_account_negative_payment_clearing.rst
@@ -10,29 +10,24 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules(['account_payment_clearing'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     'account_payment_clearing', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> payable = accounts['payable']
     >>> cash = accounts['cash']
diff --git a/modules/account_payment_clearing/tests/scenario_account_payment_clearing.rst b/modules/account_payment_clearing/tests/scenario_account_payment_clearing.rst
index d4af18259d..76d3aafd7d 100644
--- a/modules/account_payment_clearing/tests/scenario_account_payment_clearing.rst
+++ b/modules/account_payment_clearing/tests/scenario_account_payment_clearing.rst
@@ -22,23 +22,23 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules(['account_payment_clearing', 'account_statement'])
+    >>> config = activate_modules(
+    ...     ['account_payment_clearing', 'account_statement'],
+    ...     create_company, create_chart)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, (yesterday, first)))
+    ...     create_fiscalyear(today=(yesterday, first)))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account_payment_clearing/tests/scenario_account_payment_clearing_invoice_amount_to_pay.rst b/modules/account_payment_clearing/tests/scenario_account_payment_clearing_invoice_amount_to_pay.rst
index 22438ad725..fa8a97ad7b 100644
--- a/modules/account_payment_clearing/tests/scenario_account_payment_clearing_invoice_amount_to_pay.rst
+++ b/modules/account_payment_clearing/tests/scenario_account_payment_clearing_invoice_amount_to_pay.rst
@@ -11,29 +11,24 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['account_payment_clearing', 'account_invoice'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    ...     ['account_payment_clearing', 'account_invoice'],
+    ...     create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account_payment_stripe/tests/scenario_account_payment_stripe.rst b/modules/account_payment_stripe/tests/scenario_account_payment_stripe.rst
index 06d80fc749..585b937eec 100644
--- a/modules/account_payment_stripe/tests/scenario_account_payment_stripe.rst
+++ b/modules/account_payment_stripe/tests/scenario_account_payment_stripe.rst
@@ -22,23 +22,14 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_payment_stripe')
-
-Create company::
-
-    >>> Company = Model.get('company.company')
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     'account_payment_stripe', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company, today)
+    >>> fiscalyear = create_fiscalyear(today=today)
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-
 Create Stripe account::
 
     >>> StripeAccount = Model.get('account.payment.stripe.account')
@@ -65,7 +56,7 @@ Setup fetch events cron::
     >>> cron_fetch_events, = Cron.find([
     ...     ('method', '=', 'account.payment.stripe.account|fetch_events'),
     ...     ])
-    >>> cron_fetch_events.companies.append(Company(company.id))
+    >>> cron_fetch_events.companies.append(get_company())
 
 Create payment journal::
 
@@ -192,7 +183,7 @@ Run cron::
     >>> cron_customer_create, = Cron.find([
     ...     ('method', '=', 'account.payment.stripe.customer|stripe_create'),
     ...     ])
-    >>> cron_customer_create.companies.append(Company(company.id))
+    >>> cron_customer_create.companies.append(get_company())
     >>> cron_customer_create.click('run_once')
 
     >>> stripe_customer.reload()
@@ -262,7 +253,7 @@ Run cron::
     >>> cron_customer_delete, = Cron.find([
     ...     ('method', '=', 'account.payment.stripe.customer|stripe_delete'),
     ...     ])
-    >>> cron_customer_delete.companies.append(Company(company.id))
+    >>> cron_customer_delete.companies.append(get_company())
     >>> cron_customer_delete.click('run_once')
 
     >>> stripe_customer.reload()
diff --git a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_dispute.rst b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_dispute.rst
index 77c3093103..781a0a1d0a 100644
--- a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_dispute.rst
+++ b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_dispute.rst
@@ -22,22 +22,17 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_payment_stripe')
-
-Create company::
-
-    >>> Company = Model.get('company.company')
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     'account_payment_stripe', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company, today)
+    >>> fiscalyear = create_fiscalyear(today=today)
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
+    >>> _ = create_chart()
 
 Create Stripe account::
 
@@ -54,7 +49,7 @@ Setup fetch events cron::
     >>> cron_fetch_events, = Cron.find([
     ...     ('method', '=', 'account.payment.stripe.account|fetch_events'),
     ...     ])
-    >>> cron_fetch_events.companies.append(Company(company.id))
+    >>> cron_fetch_events.companies.append(get_company())
 
 Create payment journal::
 
diff --git a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_identical.rst b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_identical.rst
index f4acb960ef..a8ddfb2454 100644
--- a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_identical.rst
+++ b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_identical.rst
@@ -17,16 +17,15 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_payment_stripe')
+    >>> config = activate_modules('account_payment_stripe', create_company)
 
     >>> Company = Model.get('company.company')
     >>> Cron = Model.get('ir.cron')
     >>> StripeAccount = Model.get('account.payment.stripe.account')
     >>> StripeCustomer = Model.get('account.payment.stripe.customer')
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create Stripe account::
diff --git a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_intent.rst b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_intent.rst
index ab31f2ef2e..3d5657a695 100644
--- a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_intent.rst
+++ b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_intent.rst
@@ -22,23 +22,19 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_payment_stripe')
+    >>> config = activate_modules(
+    ...     'account_payment_stripe', create_company, create_chart)
 
-Create company::
+Get company::
 
     >>> Company = Model.get('company.company')
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company, today)
+    >>> fiscalyear = create_fiscalyear(today=today)
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-
 Create Stripe account::
 
     >>> StripeAccount = Model.get('account.payment.stripe.account')
diff --git a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_refund_failure.rst b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_refund_failure.rst
index 2afd10a89b..e1a4aa6ebf 100644
--- a/modules/account_payment_stripe/tests/scenario_account_payment_stripe_refund_failure.rst
+++ b/modules/account_payment_stripe/tests/scenario_account_payment_stripe_refund_failure.rst
@@ -21,28 +21,19 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_payment_stripe')
+    >>> config = activate_modules(
+    ...     'account_payment_stripe', create_company, create_chart)
 
-    >>> Company = Model.get('company.company')
     >>> Cron = Model.get('ir.cron')
     >>> Payment = Model.get('account.payment')
     >>> Refund = Model.get('account.payment.stripe.refund')
     >>> StripeAccount = Model.get('account.payment.stripe.account')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company, today)
+    >>> fiscalyear = create_fiscalyear(today=today)
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-
 Create Stripe account::
 
     >>> stripe_account = StripeAccount(name="Stripe")
@@ -56,7 +47,7 @@ Setup fetch events cron::
     >>> cron_fetch_events, = Cron.find([
     ...     ('method', '=', 'account.payment.stripe.account|fetch_events'),
     ...     ])
-    >>> cron_fetch_events.companies.append(Company(company.id))
+    >>> cron_fetch_events.companies.append(get_company())
 
 Create payment journal::
 
diff --git a/modules/account_receivable_rule/tests/scenario_account_receivable_rule.rst b/modules/account_receivable_rule/tests/scenario_account_receivable_rule.rst
index 1c4124bfa5..2eca6e0d33 100644
--- a/modules/account_receivable_rule/tests/scenario_account_receivable_rule.rst
+++ b/modules/account_receivable_rule/tests/scenario_account_receivable_rule.rst
@@ -9,33 +9,28 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_receivable_rule')
+    >>> config = activate_modules(
+    ...     'account_receivable_rule', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Party = Model.get('party.party')
     >>> Move = Model.get('account.move')
     >>> ReceivableRule = Model.get('account.account.receivable.rule')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create multiple receivable::
 
diff --git a/modules/account_receivable_rule/tests/scenario_account_receivable_rule_overflow.rst b/modules/account_receivable_rule/tests/scenario_account_receivable_rule_overflow.rst
index a8b14d7459..3fc37fde5c 100644
--- a/modules/account_receivable_rule/tests/scenario_account_receivable_rule_overflow.rst
+++ b/modules/account_receivable_rule/tests/scenario_account_receivable_rule_overflow.rst
@@ -9,33 +9,28 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_receivable_rule')
+    >>> config = activate_modules(
+    ...     'account_receivable_rule', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Party = Model.get('party.party')
     >>> Move = Model.get('account.move')
     >>> ReceivableRule = Model.get('account.account.receivable.rule')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create multiple receivable::
 
diff --git a/modules/account_receivable_rule/tests/scenario_account_receivable_rule_statement.rst b/modules/account_receivable_rule/tests/scenario_account_receivable_rule_statement.rst
index 120bceb739..19108d9e26 100644
--- a/modules/account_receivable_rule/tests/scenario_account_receivable_rule_statement.rst
+++ b/modules/account_receivable_rule/tests/scenario_account_receivable_rule_statement.rst
@@ -16,7 +16,9 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules(['account_receivable_rule', 'account_statement'])
+    >>> config = activate_modules(
+    ...     ['account_receivable_rule', 'account_statement'],
+    ...     create_company, create_chart)
 
     >>> AccountJournal = Model.get('account.journal')
     >>> Journal = Model.get('account.journal')
@@ -26,19 +28,14 @@ Activate modules::
     >>> Statement = Model.get('account.statement')
     >>> StatementJournal = Model.get('account.statement.journal')
 
-Create company::
-
-    >>> _ = create_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create multiple receivable::
diff --git a/modules/account_rule/tests/scenario_account_rule.rst b/modules/account_rule/tests/scenario_account_rule.rst
index a80202036d..43f1c3b305 100644
--- a/modules/account_rule/tests/scenario_account_rule.rst
+++ b/modules/account_rule/tests/scenario_account_rule.rst
@@ -9,12 +9,14 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_tax, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules(['account_rule', 'product', 'sale'])
+    >>> config = activate_modules(
+    ...     ['account_rule', 'product', 'sale'],
+    ...     create_company, create_chart)
 
     >>> AccountRule = Model.get('account.account.rule')
     >>> Party = Model.get('party.party')
@@ -24,15 +26,9 @@ Activate modules::
     >>> Sale = Model.get('sale.sale')
     >>> Tax = Model.get('account.tax')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> account_revenue1 = accounts['revenue']
     >>> account_revenue2, = account_revenue1.duplicate()
     >>> account_revenue3, = account_revenue1.duplicate()
diff --git a/modules/account_statement/tests/scenario_account_statement.rst b/modules/account_statement/tests/scenario_account_statement.rst
index 880b6ed4f0..419dc74560 100644
--- a/modules/account_statement/tests/scenario_account_statement.rst
+++ b/modules/account_statement/tests/scenario_account_statement.rst
@@ -12,30 +12,26 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules(['account_statement', 'account_invoice'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     ['account_statement', 'account_invoice'],
+    ...     create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> payable = accounts['payable']
     >>> revenue = accounts['revenue']
diff --git a/modules/account_statement/tests/scenario_account_statement_bank_account.rst b/modules/account_statement/tests/scenario_account_statement_bank_account.rst
index 9624a9800c..60ed0e78f0 100644
--- a/modules/account_statement/tests/scenario_account_statement_bank_account.rst
+++ b/modules/account_statement/tests/scenario_account_statement_bank_account.rst
@@ -12,7 +12,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules(['account_statement'])
+    >>> config = activate_modules('account_statement', create_company, create_chart)
 
     >>> AccountJournal = Model.get('account.journal')
     >>> Bank = Model.get('bank')
@@ -20,17 +20,15 @@ Activate modules::
     >>> Party = Model.get('party.party')
     >>> StatementJournal = Model.get('account.statement.journal')
 
-Create company::
+Get currencies and company::
 
     >>> eur = get_currency('EUR')
     >>> usd = get_currency('USD')
 
-    >>> _ = create_company(currency=usd)
     >>> company = get_company()
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create bank account::
diff --git a/modules/account_statement/tests/scenario_account_statement_second_currency_invoice.rst b/modules/account_statement/tests/scenario_account_statement_second_currency_invoice.rst
index 3115617385..4285d82ab2 100644
--- a/modules/account_statement/tests/scenario_account_statement_second_currency_invoice.rst
+++ b/modules/account_statement/tests/scenario_account_statement_second_currency_invoice.rst
@@ -20,7 +20,9 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules(['account_statement', 'account_invoice'])
+    >>> config = activate_modules(
+    ...     ['account_statement', 'account_invoice'],
+    ...     create_company, create_chart)
 
     >>> AccountConfiguration = Model.get('account.configuration')
     >>> AccountJournal = Model.get('account.journal')
@@ -29,20 +31,18 @@ Activate modules::
     >>> Statement = Model.get('account.statement')
     >>> StatementJournal = Model.get('account.statement.journal')
 
-Create company::
+Get currencies::
 
     >>> usd = get_currency('USD')
     >>> eur = get_currency('EUR')
-    >>> _ = create_company(currency=usd)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Configure currency exchange::
diff --git a/modules/account_statement/tests/scenario_statement_origin.rst b/modules/account_statement/tests/scenario_statement_origin.rst
index ad9d594224..1d509de75d 100644
--- a/modules/account_statement/tests/scenario_statement_origin.rst
+++ b/modules/account_statement/tests/scenario_statement_origin.rst
@@ -12,30 +12,24 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('account_statement')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_statement', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> expense = accounts['expense']
     >>> cash = accounts['cash']
diff --git a/modules/account_statement/tests/scenario_statement_origin_invoices.rst b/modules/account_statement/tests/scenario_statement_origin_invoices.rst
index 5c889a0719..fc9c65a475 100644
--- a/modules/account_statement/tests/scenario_statement_origin_invoices.rst
+++ b/modules/account_statement/tests/scenario_statement_origin_invoices.rst
@@ -12,30 +12,24 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('account_statement')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_statement', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> cash = accounts['cash']
diff --git a/modules/account_statement_aeb43/tests/scenario_account_statement_aeb43.rst b/modules/account_statement_aeb43/tests/scenario_account_statement_aeb43.rst
index 1a4b235013..a227cdb630 100644
--- a/modules/account_statement_aeb43/tests/scenario_account_statement_aeb43.rst
+++ b/modules/account_statement_aeb43/tests/scenario_account_statement_aeb43.rst
@@ -4,6 +4,8 @@ Account Statement AEB43 Scenario
 
 Imports::
 
+    >>> from functools import partial
+
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
     >>> from trytond.modules.company.tests.tools import create_company, get_company
@@ -13,20 +15,23 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_statement_aeb43')
+    >>> config = activate_modules(
+    ...     'account_statement_aeb43',
+    ...     partial(create_company, currency='EUR'), create_chart)
 
-Create company::
+Get company::
+
+    >>> company = get_company()
+
+Setup currency::
 
     >>> eur = get_currency('EUR')
     >>> eur.numeric_code = '978'
     >>> eur.save()
-    >>> _ = create_company(currency=eur)
-    >>> company = get_company()
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> cash = accounts['cash']
 
 Create parties::
diff --git a/modules/account_statement_coda/tests/scenario_account_statement_coda.rst b/modules/account_statement_coda/tests/scenario_account_statement_coda.rst
index 973bfdae14..3b8cb34bbc 100644
--- a/modules/account_statement_coda/tests/scenario_account_statement_coda.rst
+++ b/modules/account_statement_coda/tests/scenario_account_statement_coda.rst
@@ -4,26 +4,27 @@ Account Statement Coda Scenario
 
 Imports::
 
+    >>> from functools import partial
+
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
     >>> from trytond.modules.company.tests.tools import create_company, get_company
-    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
     >>> from trytond.tools import file_open
 
 Activate modules::
 
-    >>> config = activate_modules('account_statement_coda')
+    >>> config = activate_modules(
+    ...     'account_statement_coda',
+    ...     partial(create_company, currency='EUR'), create_chart)
 
-Create company::
+Get company::
 
-    >>> _ = create_company(currency=get_currency('EUR'))
     >>> company = get_company()
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> cash = accounts['cash']
 
 Create parties::
diff --git a/modules/account_statement_mt940/tests/scenario_account_statement_mt940.rst b/modules/account_statement_mt940/tests/scenario_account_statement_mt940.rst
index 4244896d66..9f10e7335d 100644
--- a/modules/account_statement_mt940/tests/scenario_account_statement_mt940.rst
+++ b/modules/account_statement_mt940/tests/scenario_account_statement_mt940.rst
@@ -4,16 +4,19 @@ Account Statement MT940 Scenario
 
 Imports::
 
+    >>> from functools import partial
+
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
     >>> from trytond.modules.company.tests.tools import create_company, get_company
-    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
     >>> from trytond.tools import file_open
 
 Activate modules::
 
-    >>> config = activate_modules('account_statement_mt940')
+    >>> config = activate_modules(
+    ...     'account_statement_mt940',
+    ...     partial(create_company, currency='EUR'), create_chart)
 
     >>> AccountJournal = Model.get('account.journal')
     >>> Bank = Model.get('bank')
@@ -22,14 +25,12 @@ Activate modules::
     >>> Statement = Model.get('account.statement')
     >>> StatementJournal = Model.get('account.statement.journal')
 
-Create company::
+Get company::
 
-    >>> _ = create_company(currency=get_currency('EUR'))
     >>> company = get_company()
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
     >>> accounts = get_accounts(company)
 
 Create parties::
diff --git a/modules/account_statement_ofx/tests/scenario_account_statement_ofx.rst b/modules/account_statement_ofx/tests/scenario_account_statement_ofx.rst
index b813fde704..e3abd5496c 100644
--- a/modules/account_statement_ofx/tests/scenario_account_statement_ofx.rst
+++ b/modules/account_statement_ofx/tests/scenario_account_statement_ofx.rst
@@ -4,26 +4,27 @@ Account Statement OFX Scenario
 
 Imports::
 
+    >>> from functools import partial
+
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
     >>> from trytond.modules.company.tests.tools import create_company, get_company
-    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
     >>> from trytond.tools import file_open
 
 Activate modules::
 
-    >>> config = activate_modules('account_statement_ofx')
+    >>> config = activate_modules(
+    ...     'account_statement_ofx',
+    ...     partial(create_company, currency='EUR'), create_chart)
 
-Create company::
+Get company::
 
-    >>> _ = create_company(currency=get_currency('EUR'))
     >>> company = get_company()
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> cash = accounts['cash']
 
 Create parties::
diff --git a/modules/account_statement_rule/tests/scenario_account_statement_rule.rst b/modules/account_statement_rule/tests/scenario_account_statement_rule.rst
index 6cfa25188e..2fcc359031 100644
--- a/modules/account_statement_rule/tests/scenario_account_statement_rule.rst
+++ b/modules/account_statement_rule/tests/scenario_account_statement_rule.rst
@@ -16,17 +16,16 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_statement_rule')
+    >>> config = activate_modules(
+    ...     'account_statement_rule', create_company, create_chart)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> cash = accounts['cash']
     >>> tax = accounts['tax']
diff --git a/modules/account_statement_rule/tests/scenario_account_statement_rule_keyword_bank_account.rst b/modules/account_statement_rule/tests/scenario_account_statement_rule_keyword_bank_account.rst
index 3fed408eed..1778faf134 100644
--- a/modules/account_statement_rule/tests/scenario_account_statement_rule_keyword_bank_account.rst
+++ b/modules/account_statement_rule/tests/scenario_account_statement_rule_keyword_bank_account.rst
@@ -19,7 +19,9 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules(['account_statement_rule', 'bank'])
+    >>> config = activate_modules(
+    ...     ['account_statement_rule', 'bank'],
+    ...     create_company, create_chart)
 
     >>> AccountJournal = Model.get('account.journal')
     >>> Bank = Model.get('bank')
@@ -29,21 +31,19 @@ Activate modules::
     >>> Statement = Model.get('account.statement')
     >>> StatementJournal = Model.get('account.statement.journal')
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create a party::
 
diff --git a/modules/account_statement_rule/tests/scenario_account_statement_rule_keywords.rst b/modules/account_statement_rule/tests/scenario_account_statement_rule_keywords.rst
index 119a73b5b3..a5bde2c543 100644
--- a/modules/account_statement_rule/tests/scenario_account_statement_rule_keywords.rst
+++ b/modules/account_statement_rule/tests/scenario_account_statement_rule_keywords.rst
@@ -19,23 +19,22 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_statement_rule')
+    >>> config = activate_modules(
+    ...     'account_statement_rule', create_company, create_chart)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> cash = accounts['cash']
 
diff --git a/modules/account_statement_sepa/tests/scenario_account_statement_sepa.rst b/modules/account_statement_sepa/tests/scenario_account_statement_sepa.rst
index c70f801fea..70f320a289 100644
--- a/modules/account_statement_sepa/tests/scenario_account_statement_sepa.rst
+++ b/modules/account_statement_sepa/tests/scenario_account_statement_sepa.rst
@@ -4,16 +4,19 @@ Account Statement Sepa Scenario
 
 Imports::
 
+    >>> from functools import partial
+
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
     >>> from trytond.modules.company.tests.tools import create_company, get_company
-    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
     >>> from trytond.tools import file_open
 
 Activate modules::
 
-    >>> config = activate_modules('account_statement_sepa')
+    >>> config = activate_modules(
+    ...     'account_statement_sepa',
+    ...     partial(create_company, currency='EUR'), create_chart)
 
     >>> AccountJournal = Model.get('account.journal')
     >>> Bank = Model.get('bank')
@@ -21,15 +24,13 @@ Activate modules::
     >>> Party = Model.get('party.party')
     >>> StatementJournal = Model.get('account.statement.journal')
 
-Create company::
+Get company::
 
-    >>> _ = create_company(currency=get_currency('EUR'))
     >>> company = get_company()
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create parties::
 
diff --git a/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon.rst b/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon.rst
index fd9face77e..df2a85b143 100644
--- a/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon.rst
+++ b/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon.rst
@@ -16,7 +16,7 @@ Imports::
     ...     add_cogs_accounts)
     >>> from trytond.modules.account_stock_continental.tests.tools import (
     ...     add_stock_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, set_user
 
     >>> today = dt.date.today()
@@ -27,12 +27,8 @@ Activate modules::
     ...         'account_stock_anglo_saxon',
     ...         'sale',
     ...         'purchase',
-    ...         ])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    ...         ],
+    ...     create_company, create_chart)
 
 Create the required users::
 
@@ -69,15 +65,13 @@ Create the required users::
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.account_stock_method = 'anglo_saxon'
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_cogs_accounts(add_stock_accounts(
-    ...         get_accounts(company), company), company)
+    >>> accounts = add_cogs_accounts(add_stock_accounts(get_accounts()))
     >>> receivable = accounts['receivable']
     >>> payable = accounts['payable']
     >>> revenue = accounts['revenue']
diff --git a/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst b/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
index 85a9836f02..dc17c803f3 100644
--- a/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
+++ b/modules/account_stock_anglo_saxon/tests/scenario_account_stock_anglo_saxon_with_drop_shipment.rst
@@ -16,7 +16,7 @@ Imports::
     ...     add_cogs_accounts)
     >>> from trytond.modules.account_stock_continental.tests.tools import (
     ...     add_stock_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, set_user
 
     >>> today = dt.date.today()
@@ -28,12 +28,8 @@ Activate modules::
     ...         'sale_supply_drop_shipment',
     ...         'sale',
     ...         'purchase',
-    ...         ])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    ...         ],
+    ...     create_company, create_chart)
 
 Create sale user::
 
@@ -79,15 +75,13 @@ Create account user::
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.account_stock_method = 'anglo_saxon'
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_cogs_accounts(add_stock_accounts(
-    ...         get_accounts(company), company), company)
+    >>> accounts = add_cogs_accounts(add_stock_accounts(get_accounts()))
     >>> receivable = accounts['receivable']
     >>> payable = accounts['payable']
     >>> revenue = accounts['revenue']
diff --git a/modules/account_stock_continental/tests/scenario_account_stock_continental.rst b/modules/account_stock_continental/tests/scenario_account_stock_continental.rst
index 0964693581..b994ca79c0 100644
--- a/modules/account_stock_continental/tests/scenario_account_stock_continental.rst
+++ b/modules/account_stock_continental/tests/scenario_account_stock_continental.rst
@@ -14,7 +14,7 @@ Imports::
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
     >>> from trytond.modules.account_stock_continental.tests.tools import (
     ...     add_stock_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
@@ -26,24 +26,19 @@ Activate modules::
     ...         'sale',
     ...         'purchase',
     ...         'sale_supply_drop_shipment',
-    ...         ])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    ...         ],
+    ...     create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.account_stock_method = 'continental'
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_stock_accounts(get_accounts(company), company)
+    >>> accounts = add_stock_accounts(get_accounts())
     >>> receivable = accounts['receivable']
     >>> payable = accounts['payable']
     >>> revenue = accounts['revenue']
diff --git a/modules/account_stock_landed_cost/tests/scenario_account_stock_landed_cost.rst b/modules/account_stock_landed_cost/tests/scenario_account_stock_landed_cost.rst
index 8dc8ee0697..fe76fe6f2f 100644
--- a/modules/account_stock_landed_cost/tests/scenario_account_stock_landed_cost.rst
+++ b/modules/account_stock_landed_cost/tests/scenario_account_stock_landed_cost.rst
@@ -19,23 +19,22 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_stock_landed_cost')
+    >>> config = activate_modules(
+    ...     'account_stock_landed_cost', create_company, create_chart)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> payable = accounts['payable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account_stock_landed_cost_weight/tests/scenario_account_stock_landed_cost_weight.rst b/modules/account_stock_landed_cost_weight/tests/scenario_account_stock_landed_cost_weight.rst
index 01235fbe1e..468c17f969 100644
--- a/modules/account_stock_landed_cost_weight/tests/scenario_account_stock_landed_cost_weight.rst
+++ b/modules/account_stock_landed_cost_weight/tests/scenario_account_stock_landed_cost_weight.rst
@@ -19,23 +19,22 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_stock_landed_cost_weight')
+    >>> config = activate_modules(
+    ...     'account_stock_landed_cost_weight', create_company, create_chart)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> payable = accounts['payable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account_stock_shipment_cost/tests/scenario_account_stock_shipment_cost.rst b/modules/account_stock_shipment_cost/tests/scenario_account_stock_shipment_cost.rst
index 1ff7f3dba8..122219981e 100644
--- a/modules/account_stock_shipment_cost/tests/scenario_account_stock_shipment_cost.rst
+++ b/modules/account_stock_shipment_cost/tests/scenario_account_stock_shipment_cost.rst
@@ -21,7 +21,8 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_stock_shipment_cost')
+    >>> config = activate_modules(
+    ...     'account_stock_shipment_cost', create_company, create_chart)
 
     >>> Invoice = Model.get('account.invoice')
     >>> InvoiceLine = Model.get('account.invoice.line')
@@ -34,21 +35,19 @@ Activate modules::
     >>> ShipmentCost = Model.get('account.shipment_cost')
     >>> Warning = Model.get('res.user.warning')
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create parties::
 
diff --git a/modules/account_stock_shipment_cost_weight/tests/scenario_account_stock_shipment_cost_weight.rst b/modules/account_stock_shipment_cost_weight/tests/scenario_account_stock_shipment_cost_weight.rst
index 6691c9b179..f11d03f5a0 100644
--- a/modules/account_stock_shipment_cost_weight/tests/scenario_account_stock_shipment_cost_weight.rst
+++ b/modules/account_stock_shipment_cost_weight/tests/scenario_account_stock_shipment_cost_weight.rst
@@ -19,7 +19,8 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('account_stock_shipment_cost_weight')
+    >>> config = activate_modules(
+    ...     'account_stock_shipment_cost_weight', create_company, create_chart)
 
     >>> Invoice = Model.get('account.invoice')
     >>> Location = Model.get('stock.location')
@@ -30,21 +31,19 @@ Activate modules::
     >>> ShipmentOut = Model.get('stock.shipment.out')
     >>> ShipmentCost = Model.get('account.shipment_cost')
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create parties::
 
diff --git a/modules/account_tax_cash/tests/scenario_account_tax_cash.rst b/modules/account_tax_cash/tests/scenario_account_tax_cash.rst
index cbfef5a6d5..9432fdda66 100644
--- a/modules/account_tax_cash/tests/scenario_account_tax_cash.rst
+++ b/modules/account_tax_cash/tests/scenario_account_tax_cash.rst
@@ -11,29 +11,23 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, create_tax_code, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_tax_cash')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_tax_cash', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account_tax_cash/tests/scenario_account_tax_cash_period_close.rst b/modules/account_tax_cash/tests/scenario_account_tax_cash_period_close.rst
index 6b2c2c3674..c6fd95b8af 100644
--- a/modules/account_tax_cash/tests/scenario_account_tax_cash_period_close.rst
+++ b/modules/account_tax_cash/tests/scenario_account_tax_cash_period_close.rst
@@ -11,29 +11,23 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_tax_cash')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_tax_cash', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account_tax_cash/tests/scenario_account_tax_cash_reconciliation.rst b/modules/account_tax_cash/tests/scenario_account_tax_cash_reconciliation.rst
index 38891d25b8..558216d16a 100644
--- a/modules/account_tax_cash/tests/scenario_account_tax_cash_reconciliation.rst
+++ b/modules/account_tax_cash/tests/scenario_account_tax_cash_reconciliation.rst
@@ -11,29 +11,23 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, create_tax_code, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_tax_cash')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_tax_cash', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account_tax_cash/tests/scenario_account_tax_cash_supplier.rst b/modules/account_tax_cash/tests/scenario_account_tax_cash_supplier.rst
index ef04305955..68eb693ee9 100644
--- a/modules/account_tax_cash/tests/scenario_account_tax_cash_supplier.rst
+++ b/modules/account_tax_cash/tests/scenario_account_tax_cash_supplier.rst
@@ -11,29 +11,23 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('account_tax_cash')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('account_tax_cash', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/account_tax_non_deductible/tests/scenario_account_tax_non_deductible.rst b/modules/account_tax_non_deductible/tests/scenario_account_tax_non_deductible.rst
index cedca4889d..677178650a 100644
--- a/modules/account_tax_non_deductible/tests/scenario_account_tax_non_deductible.rst
+++ b/modules/account_tax_non_deductible/tests/scenario_account_tax_non_deductible.rst
@@ -12,35 +12,30 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, create_tax_code, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('account_tax_non_deductible')
+    >>> config = activate_modules(
+    ...     'account_tax_non_deductible', create_company, create_chart)
 
     >>> Invoice = Model.get('account.invoice')
     >>> Party = Model.get('party.party')
     >>> TaxCode = Model.get('account.tax.code')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
     >>> period_ids = [p.id for p in fiscalyear.periods]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create taxes::
 
diff --git a/modules/analytic_account/tests/scenario_analytic_account.rst b/modules/analytic_account/tests/scenario_analytic_account.rst
index 06af73f361..4bb3749166 100644
--- a/modules/analytic_account/tests/scenario_analytic_account.rst
+++ b/modules/analytic_account/tests/scenario_analytic_account.rst
@@ -9,31 +9,25 @@ Imports::
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('analytic_account')
+    >>> config = activate_modules('analytic_account', create_company, create_chart)
 
     >>> Reconciliation = Model.get('account.move.reconciliation')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> Journal = Model.get('account.journal')
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> Journal = Model.get('account.journal')
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
@@ -56,11 +50,11 @@ Create analytic accounts::
 Create analytic rules::
 
     >>> AnalyticRule = Model.get('analytic_account.rule')
-    >>> rule1 = AnalyticRule(company=company, account=expense)
+    >>> rule1 = AnalyticRule(account=expense)
     >>> entry, = rule1.analytic_accounts
     >>> entry.account = analytic_account
     >>> rule1.save()
-    >>> rule2 = AnalyticRule(company=company, account=revenue)
+    >>> rule2 = AnalyticRule(account=revenue)
     >>> entry, = rule2.analytic_accounts
     >>> entry.account = analytic_account2
     >>> rule2.save()
diff --git a/modules/analytic_budget/tests/scenario_analytic_budget.rst b/modules/analytic_budget/tests/scenario_analytic_budget.rst
index fc6d462b74..0208a3ed24 100644
--- a/modules/analytic_budget/tests/scenario_analytic_budget.rst
+++ b/modules/analytic_budget/tests/scenario_analytic_budget.rst
@@ -9,12 +9,12 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_fiscalyear, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate the analytic_budget module::
 
-    >>> config = activate_modules('analytic_budget')
+    >>> config = activate_modules('analytic_budget', create_company, create_chart)
 
     >>> AnalyticAccount = Model.get('analytic_account.account')
     >>> Budget = Model.get('analytic_account.budget')
@@ -23,22 +23,16 @@ Activate the analytic_budget module::
     >>> Move = Model.get('account.move')
     >>> Party = Model.get('party.party')
 
-Create a company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create a fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
     >>> next_period = fiscalyear.periods[1]
 
-Create a chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create the analytic accounts::
 
diff --git a/modules/analytic_invoice/tests/scenario_analytic_invoice.rst b/modules/analytic_invoice/tests/scenario_analytic_invoice.rst
index 42a8273800..ac98e8eae3 100644
--- a/modules/analytic_invoice/tests/scenario_analytic_invoice.rst
+++ b/modules/analytic_invoice/tests/scenario_analytic_invoice.rst
@@ -11,28 +11,22 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('analytic_invoice')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('analytic_invoice', create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/analytic_invoice/tests/scenario_analytic_invoice_asset.rst b/modules/analytic_invoice/tests/scenario_analytic_invoice_asset.rst
index 73ab14fd67..be52db9a77 100644
--- a/modules/analytic_invoice/tests/scenario_analytic_invoice_asset.rst
+++ b/modules/analytic_invoice/tests/scenario_analytic_invoice_asset.rst
@@ -15,7 +15,7 @@ Imports::
     >>> from trytond.modules.account_asset.tests.tools import add_asset_accounts
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
@@ -24,23 +24,19 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules(['analytic_invoice', 'account_asset'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     ['analytic_invoice', 'account_asset'],
+    ...     create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, (today, next_next_month)))
+    ...     create_fiscalyear(today=(today, next_next_month)))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_asset_accounts(get_accounts(company), company)
+    >>> accounts = add_asset_accounts(get_accounts())
     >>> revenue = accounts['revenue']
     >>> asset_account = accounts['asset']
     >>> expense = accounts['expense']
diff --git a/modules/analytic_invoice/tests/scenario_analytic_invoice_defer.rst b/modules/analytic_invoice/tests/scenario_analytic_invoice_defer.rst
index a2486232cd..e0a9e972e4 100644
--- a/modules/analytic_invoice/tests/scenario_analytic_invoice_defer.rst
+++ b/modules/analytic_invoice/tests/scenario_analytic_invoice_defer.rst
@@ -14,14 +14,16 @@ Imports::
     ...     set_fiscalyear_invoice_sequences)
     >>> from trytond.modules.account_invoice_defer.tests.tools import (
     ...     add_deferred_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules(['analytic_invoice', 'account_invoice_defer'])
+    >>> config = activate_modules(
+    ...     ['analytic_invoice', 'account_invoice_defer'],
+    ...     create_company, create_chart)
 
     >>> AnalyticAccount = Model.get('analytic_account.account')
     >>> Invoice = Model.get('account.invoice')
@@ -30,22 +32,16 @@ Activate modules::
     >>> ProductCategory = Model.get('product.category')
     >>> ProductUom = Model.get('product.uom')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
     >>> period = fiscalyear.periods[0]
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_deferred_accounts(get_accounts(company))
+    >>> accounts = add_deferred_accounts(get_accounts())
 
 Create analytic accounts::
 
diff --git a/modules/analytic_purchase/tests/scenario_analytic_purchase.rst b/modules/analytic_purchase/tests/scenario_analytic_purchase.rst
index 9df2ad1025..498b24366a 100644
--- a/modules/analytic_purchase/tests/scenario_analytic_purchase.rst
+++ b/modules/analytic_purchase/tests/scenario_analytic_purchase.rst
@@ -11,17 +11,12 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, set_user
 
 Activate modules::
 
-    >>> config = activate_modules('analytic_purchase')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('analytic_purchase', create_company, create_chart)
 
 Create purchase user::
 
@@ -37,13 +32,12 @@ Create purchase user::
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/analytic_sale/tests/scenario_analytic_sale.rst b/modules/analytic_sale/tests/scenario_analytic_sale.rst
index 50bcf6aff6..781b5fe521 100644
--- a/modules/analytic_sale/tests/scenario_analytic_sale.rst
+++ b/modules/analytic_sale/tests/scenario_analytic_sale.rst
@@ -11,17 +11,12 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, set_user
 
 Activate modules::
 
-    >>> config = activate_modules('analytic_sale')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('analytic_sale', create_company, create_chart)
 
 Create sale user::
 
@@ -37,13 +32,12 @@ Create sale user::
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/carrier_carriage/tests/scenario_carrier_carriage.rst b/modules/carrier_carriage/tests/scenario_carrier_carriage.rst
index f57b00d612..cd948e815e 100644
--- a/modules/carrier_carriage/tests/scenario_carrier_carriage.rst
+++ b/modules/carrier_carriage/tests/scenario_carrier_carriage.rst
@@ -8,12 +8,14 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules(['carrier_carriage', 'sale_shipment_cost'])
+    >>> config = activate_modules(
+    ...     ['carrier_carriage', 'sale_shipment_cost'],
+    ...     create_company, create_chart)
 
     >>> Carrier = Model.get('carrier')
     >>> Party = Model.get('party.party')
@@ -22,15 +24,9 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create customer::
 
diff --git a/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst b/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
index 5caf5dae18..0aad9028b8 100644
--- a/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
+++ b/modules/carrier_percentage/tests/scenario_carrier_percentage_with_purchase_shipment_cost.rst
@@ -20,23 +20,22 @@ Activate modules::
     ...         'carrier_percentage',
     ...         'purchase_shipment_cost',
     ...         'sale_shipment_cost',
-    ...         ])
+    ...         ],
+    ...     create_company, create_chart)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create supplier::
diff --git a/modules/carrier_subdivision/tests/scenario_carrier_subdivision.rst b/modules/carrier_subdivision/tests/scenario_carrier_subdivision.rst
index e6336c33b5..e33acdb1d8 100644
--- a/modules/carrier_subdivision/tests/scenario_carrier_subdivision.rst
+++ b/modules/carrier_subdivision/tests/scenario_carrier_subdivision.rst
@@ -7,17 +7,13 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules(['carrier_subdivision', 'sale_shipment_cost'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     ['carrier_subdivision', 'sale_shipment_cost'], create_company)
 
 Create subdivisions::
 
diff --git a/modules/carrier_subdivision/tests/scenario_carrier_subdivision_postal_code.rst b/modules/carrier_subdivision/tests/scenario_carrier_subdivision_postal_code.rst
index 2cdc33adaf..11d4dd876a 100644
--- a/modules/carrier_subdivision/tests/scenario_carrier_subdivision_postal_code.rst
+++ b/modules/carrier_subdivision/tests/scenario_carrier_subdivision_postal_code.rst
@@ -7,17 +7,13 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules(['carrier_subdivision', 'sale_shipment_cost'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     ['carrier_subdivision', 'sale_shipment_cost'], create_company)
 
 Create customers::
 
diff --git a/modules/carrier_weight/tests/scenario_carrier_weight.rst b/modules/carrier_weight/tests/scenario_carrier_weight.rst
index 6e43e36648..e003c853d6 100644
--- a/modules/carrier_weight/tests/scenario_carrier_weight.rst
+++ b/modules/carrier_weight/tests/scenario_carrier_weight.rst
@@ -20,23 +20,22 @@ Activate modules::
     ...         'carrier_weight',
     ...         'purchase_shipment_cost',
     ...         'sale_shipment_cost',
-    ...         ])
+    ...         ],
+    ...     create_company, create_chart)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create supplier::
diff --git a/modules/commission/tests/scenario_agent_selection.rst b/modules/commission/tests/scenario_agent_selection.rst
index 9b9b54840c..51368b2920 100644
--- a/modules/commission/tests/scenario_agent_selection.rst
+++ b/modules/commission/tests/scenario_agent_selection.rst
@@ -16,17 +16,15 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules(['commission', 'sale'])
+    >>> config = activate_modules(['commission', 'sale'], create_company, create_chart)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create employee::
 
diff --git a/modules/commission/tests/scenario_commission.rst b/modules/commission/tests/scenario_commission.rst
index 729a04ff14..6d6b2d6cc4 100644
--- a/modules/commission/tests/scenario_commission.rst
+++ b/modules/commission/tests/scenario_commission.rst
@@ -20,26 +20,24 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('commission')
+    >>> config = activate_modules('commission', create_company, create_chart)
 
     >>> ReportingAgent = Model.get('commission.reporting.agent')
     >>> ReportingAgentTimeseries = Model.get('commission.reporting.agent.time_series')
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, (today, tomorrow)))
+    ...     create_fiscalyear(today=(today, tomorrow)))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create customer::
 
diff --git a/modules/commission/tests/scenario_commission_credit_posted_invoice.rst b/modules/commission/tests/scenario_commission_credit_posted_invoice.rst
index 477fb92eaa..80e4af2d42 100644
--- a/modules/commission/tests/scenario_commission_credit_posted_invoice.rst
+++ b/modules/commission/tests/scenario_commission_credit_posted_invoice.rst
@@ -16,7 +16,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('commission')
+    >>> config = activate_modules('commission', create_company, create_chart)
 
     >>> Agent = Model.get('commission.agent')
     >>> Commission = Model.get('commission')
@@ -27,21 +27,19 @@ Activate modules::
     >>> Template = Model.get('product.template')
     >>> Uom = Model.get('product.uom')
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    ...     create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create customer::
 
diff --git a/modules/commission/tests/scenario_commission_stock.rst b/modules/commission/tests/scenario_commission_stock.rst
index f082c2a42c..03283c8382 100644
--- a/modules/commission/tests/scenario_commission_stock.rst
+++ b/modules/commission/tests/scenario_commission_stock.rst
@@ -21,7 +21,8 @@ Imports::
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['commission', 'sale', 'stock', 'account_invoice_stock'])
+    ...     ['commission', 'sale', 'stock', 'account_invoice_stock'],
+    ...     create_company, create_chart)
 
     >>> Agent = Model.get('commission.agent')
     >>> Commission = Model.get('commission')
@@ -33,21 +34,19 @@ Activate modules::
     >>> Template = Model.get('product.template')
     >>> Uom = Model.get('product.uom')
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, (yesterday, today)))
+    ...     create_fiscalyear(today=(yesterday, today)))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create customer::
 
diff --git a/modules/commission_waiting/tests/scenario_commission_waiting.rst b/modules/commission_waiting/tests/scenario_commission_waiting.rst
index 3f4cb106bd..1afcf1ee62 100644
--- a/modules/commission_waiting/tests/scenario_commission_waiting.rst
+++ b/modules/commission_waiting/tests/scenario_commission_waiting.rst
@@ -19,23 +19,21 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('commission_waiting')
+    >>> config = activate_modules('commission_waiting', create_company, create_chart)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create waiting account::
 
diff --git a/modules/company/tests/tools.py b/modules/company/tests/tools.py
index 95caafc138..173c21b830 100644
--- a/modules/company/tests/tools.py
+++ b/modules/company/tests/tools.py
@@ -21,6 +21,8 @@ def create_company(party=None, currency=None, config=None):
     company.party = party
     if not currency:
         currency = get_currency(config=config)
+    elif isinstance(currency, str):
+        currency = get_currency(currency, config=config)
     company.currency = currency
     company_config.execute('add')
 
diff --git a/modules/document_incoming_invoice/tests/scenario_document_incoming_invoice.rst b/modules/document_incoming_invoice/tests/scenario_document_incoming_invoice.rst
index 08cf19adfd..83a6633c4f 100644
--- a/modules/document_incoming_invoice/tests/scenario_document_incoming_invoice.rst
+++ b/modules/document_incoming_invoice/tests/scenario_document_incoming_invoice.rst
@@ -13,21 +13,17 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('document_incoming_invoice')
+    >>> config = activate_modules(
+    ...     'document_incoming_invoice', create_company, create_chart)
 
     >>> Document = Model.get('document.incoming')
     >>> DocumentConfiguration = Model.get('document.incoming.configuration')
     >>> Party = Model.get('party.party')
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
-Create chart of account::
-
-    >>> _ = create_chart()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
diff --git a/modules/document_incoming_ocr_typless/tests/scenario_document_incoming_ocr_typless.rst b/modules/document_incoming_ocr_typless/tests/scenario_document_incoming_ocr_typless.rst
index 5e89617ddb..b0538f5813 100644
--- a/modules/document_incoming_ocr_typless/tests/scenario_document_incoming_ocr_typless.rst
+++ b/modules/document_incoming_ocr_typless/tests/scenario_document_incoming_ocr_typless.rst
@@ -12,7 +12,7 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
     >>> from trytond.tools import file_open
 
@@ -20,7 +20,8 @@ Activate modules::
 
     >>> config = activate_modules([
     ...     'document_incoming_ocr_typless',
-    ...     'document_incoming_invoice'])
+    ...     'document_incoming_invoice'],
+    ...     create_company, create_chart)
 
     >>> Document = Model.get('document.incoming')
     >>> OCRService = Model.get('document.incoming.ocr.service')
@@ -29,21 +30,15 @@ Activate modules::
     >>> ProductTemplate = Model.get('product.template')
     >>> UoM = Model.get('product.uom')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of account::
-
-    >>> _ = create_chart()
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create taxes::
 
-    >>> tax_10 = create_tax(Decimal('0.1'), company)
+    >>> tax_10 = create_tax(Decimal('0.1'))
     >>> tax_10.save()
-    >>> tax_20 = create_tax(Decimal('0.2'), company)
+    >>> tax_20 = create_tax(Decimal('0.2'))
     >>> tax_20.save()
 
 Create fiscal year::
diff --git a/modules/incoterm/tests/scenario_incoterm.rst b/modules/incoterm/tests/scenario_incoterm.rst
index c1f5d74fdf..4b4311ff31 100644
--- a/modules/incoterm/tests/scenario_incoterm.rst
+++ b/modules/incoterm/tests/scenario_incoterm.rst
@@ -14,7 +14,8 @@ Imports::
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['incoterm', 'sale', 'sale_shipment_cost', 'purchase'])
+    ...     ['incoterm', 'sale', 'sale_shipment_cost', 'purchase'],
+    ...     create_company, create_chart)
 
     >>> Address = Model.get('party.address')
     >>> Carrier = Model.get('carrier')
@@ -35,9 +36,8 @@ Create countries::
     >>> china = Country(name="China", code='CN')
     >>> china.save()
 
-Create company::
+Setup company::
 
-    >>> _ = create_company()
     >>> company = get_company()
     >>> company.incoterms.extend(Incoterm.find([
     ...         ('code', 'in', ['FCA', 'CIP', 'CFR', 'CIF']),
@@ -45,9 +45,8 @@ Create company::
     ...         ]))
     >>> company.save()
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
     >>> accounts = get_accounts(company)
 
 Create addresses::
diff --git a/modules/marketing_automation/tests/scenario_marketing_automation_unsubscribable.rst b/modules/marketing_automation/tests/scenario_marketing_automation_unsubscribable.rst
index ea954d6a5f..7a228e500f 100644
--- a/modules/marketing_automation/tests/scenario_marketing_automation_unsubscribable.rst
+++ b/modules/marketing_automation/tests/scenario_marketing_automation_unsubscribable.rst
@@ -21,7 +21,7 @@ Patch send_message_transactional::
 
 Activate modules::
 
-    >>> config = activate_modules(['marketing_automation', 'sale'])
+    >>> config = activate_modules(['marketing_automation', 'sale'], create_company)
 
     >>> Activity = Model.get('marketing.automation.activity')
     >>> Cron = Model.get('ir.cron')
@@ -46,10 +46,6 @@ Create a party::
     >>> contact.value = 'michael@example.com'
     >>> party.save()
 
-Create company::
-
-    >>> _ = create_company()
-
 Create a sale::
 
     >>> sale = Sale(party=party)
diff --git a/modules/marketing_campaign/tests/scenario_marketing_campaign_sale.rst b/modules/marketing_campaign/tests/scenario_marketing_campaign_sale.rst
index 3efc350506..2832a0701e 100644
--- a/modules/marketing_campaign/tests/scenario_marketing_campaign_sale.rst
+++ b/modules/marketing_campaign/tests/scenario_marketing_campaign_sale.rst
@@ -11,13 +11,14 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['marketing_campaign', 'sale', 'sale_opportunity'])
+    ...     ['marketing_campaign', 'sale', 'sale_opportunity'],
+    ...     create_company, create_chart)
 
     >>> Category = Model.get('product.category')
     >>> Employee = Model.get('company.employee')
@@ -29,11 +30,6 @@ Activate modules::
     >>> ReportingMarketing = Model.get('sale.reporting.marketing')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create employee::
 
     >>> employee = Employee(party=Party(name="Employee"))
@@ -42,14 +38,12 @@ Create employee::
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create party::
 
diff --git a/modules/product/tests/scenario_product_variant.rst b/modules/product/tests/scenario_product_variant.rst
index 2362e5bf2c..92add587c8 100644
--- a/modules/product/tests/scenario_product_variant.rst
+++ b/modules/product/tests/scenario_product_variant.rst
@@ -12,11 +12,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('product')
-
-Create company::
-
-    >>> _ = create_company()
+    >>> config = activate_modules('product', create_company)
 
 Create a template::
 
diff --git a/modules/product_cost_fifo/tests/scenario_product_cost_fifo.rst b/modules/product_cost_fifo/tests/scenario_product_cost_fifo.rst
index e0a5cc3b2a..32a113ecd7 100644
--- a/modules/product_cost_fifo/tests/scenario_product_cost_fifo.rst
+++ b/modules/product_cost_fifo/tests/scenario_product_cost_fifo.rst
@@ -15,11 +15,10 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('product_cost_fifo')
+    >>> config = activate_modules('product_cost_fifo', create_company)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create product::
diff --git a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_no_in.rst b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_no_in.rst
index 43dcf951ab..7a66ec606c 100644
--- a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_no_in.rst
+++ b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_no_in.rst
@@ -15,11 +15,10 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('product_cost_fifo')
+    >>> config = activate_modules('product_cost_fifo', create_company)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create product::
diff --git a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst
index dedb8ea016..5cabbfb7b6 100644
--- a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst
+++ b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price.rst
@@ -15,11 +15,10 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('product_cost_fifo')
+    >>> config = activate_modules('product_cost_fifo', create_company)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create product::
diff --git a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price_production.rst b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price_production.rst
index 9b8e19c4cf..7ee5675e57 100644
--- a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price_production.rst
+++ b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_recompute_cost_price_production.rst
@@ -16,16 +16,15 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('product_cost_fifo')
+    >>> config = activate_modules('product_cost_fifo', create_company)
 
     >>> Location = Model.get('stock.location')
     >>> ProductUom = Model.get('product.uom')
     >>> ProductTemplate = Model.get('product.template')
     >>> StockMove = Model.get('stock.move')
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create product::
diff --git a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_uom.rst b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_uom.rst
index a6b8d78840..48b4be6f0c 100644
--- a/modules/product_cost_fifo/tests/scenario_product_cost_fifo_uom.rst
+++ b/modules/product_cost_fifo/tests/scenario_product_cost_fifo_uom.rst
@@ -15,11 +15,10 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('product_cost_fifo')
+    >>> config = activate_modules('product_cost_fifo', create_company)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create product::
diff --git a/modules/product_cost_history/tests/scenario_product_cost_history.rst b/modules/product_cost_history/tests/scenario_product_cost_history.rst
index 75d7bc4ac8..21fefa7e3b 100644
--- a/modules/product_cost_history/tests/scenario_product_cost_history.rst
+++ b/modules/product_cost_history/tests/scenario_product_cost_history.rst
@@ -13,13 +13,12 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('product_cost_history')
+    >>> config = activate_modules('product_cost_history', create_company)
 
     >>> Date = Model.get('ir.date')
 
-Create company::
+Setup company::
 
-    >>> _ = create_company()
     >>> company = get_company()
     >>> company.timezone = 'Europe/Madrid'
     >>> company.save()
diff --git a/modules/product_cost_warehouse/tests/scenario_account_stock_continental.rst b/modules/product_cost_warehouse/tests/scenario_account_stock_continental.rst
index ca9e963783..3a3f8bf76b 100644
--- a/modules/product_cost_warehouse/tests/scenario_account_stock_continental.rst
+++ b/modules/product_cost_warehouse/tests/scenario_account_stock_continental.rst
@@ -17,7 +17,8 @@ Imports::
 Activate product_cost_warehouse::
 
     >>> config = activate_modules([
-    ...         'product_cost_warehouse', 'account_stock_continental'])
+    ...         'product_cost_warehouse', 'account_stock_continental'],
+    ...     create_company, create_chart)
 
     >>> Location = Model.get('stock.location')
     >>> Product = Model.get('product.product')
@@ -28,21 +29,19 @@ Activate product_cost_warehouse::
     >>> ShipmentInternal = Model.get('stock.shipment.internal')
     >>> StockConfiguration = Model.get('stock.configuration')
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.account_stock_method = 'continental'
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_stock_accounts(get_accounts(company), company)
+    >>> accounts = add_stock_accounts(get_accounts())
 
 Create product category::
 
diff --git a/modules/product_cost_warehouse/tests/scenario_product_cost_fifo_warehouse.rst b/modules/product_cost_warehouse/tests/scenario_product_cost_fifo_warehouse.rst
index 4d8bb721b2..afb8b1ae8f 100644
--- a/modules/product_cost_warehouse/tests/scenario_product_cost_fifo_warehouse.rst
+++ b/modules/product_cost_warehouse/tests/scenario_product_cost_fifo_warehouse.rst
@@ -13,11 +13,10 @@ Imports::
 Activate product_cost_warehouse::
 
     >>> config = activate_modules(
-    ...     ['product_cost_warehouse', 'product_cost_fifo'])
+    ...     ['product_cost_warehouse', 'product_cost_fifo'], create_company)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create product::
diff --git a/modules/product_cost_warehouse/tests/scenario_product_cost_warehouse.rst b/modules/product_cost_warehouse/tests/scenario_product_cost_warehouse.rst
index 71433490c4..5faf477d09 100644
--- a/modules/product_cost_warehouse/tests/scenario_product_cost_warehouse.rst
+++ b/modules/product_cost_warehouse/tests/scenario_product_cost_warehouse.rst
@@ -12,11 +12,10 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('product_cost_warehouse')
+    >>> config = activate_modules('product_cost_warehouse', create_company)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create product::
diff --git a/modules/product_kit/tests/scenario_product_kit.rst b/modules/product_kit/tests/scenario_product_kit.rst
index 230f3211fe..254da6e443 100644
--- a/modules/product_kit/tests/scenario_product_kit.rst
+++ b/modules/product_kit/tests/scenario_product_kit.rst
@@ -12,11 +12,10 @@ Imports::
 
 Activate product_kit and stock::
 
-    >>> config = activate_modules(['product_kit', 'stock'])
+    >>> config = activate_modules(['product_kit', 'stock'], create_company)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create products::
diff --git a/modules/product_kit/tests/scenario_product_kit_duplicate.rst b/modules/product_kit/tests/scenario_product_kit_duplicate.rst
index 222841534e..805e75b261 100644
--- a/modules/product_kit/tests/scenario_product_kit_duplicate.rst
+++ b/modules/product_kit/tests/scenario_product_kit_duplicate.rst
@@ -12,16 +12,12 @@ Imports::
 
 Activate product_kit::
 
-    >>> config = activate_modules('product_kit')
+    >>> config = activate_modules('product_kit', create_company)
 
     >>> Uom = Model.get('product.uom')
     >>> ProductTemplate = Model.get('product.template')
     >>> Product = Model.get('product.product')
 
-Create company::
-
-    >>> _ = create_company()
-
 Create products::
 
     >>> unit, = Uom.find([('name', '=', 'Unit')])
diff --git a/modules/product_kit/tests/scenario_product_kit_purchase.rst b/modules/product_kit/tests/scenario_product_kit_purchase.rst
index 69f3036088..3a6f4f090e 100644
--- a/modules/product_kit/tests/scenario_product_kit_purchase.rst
+++ b/modules/product_kit/tests/scenario_product_kit_purchase.rst
@@ -12,7 +12,7 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -21,23 +21,18 @@ Activate product_kit, purchase and account_invoice::
 
     >>> config = activate_modules(
     ...     ['product_kit', 'purchase', 'account_invoice',
-    ...         'account_invoice_stock'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    ...         'account_invoice_stock'],
+    ...     create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create party::
 
diff --git a/modules/product_kit/tests/scenario_product_kit_sale.rst b/modules/product_kit/tests/scenario_product_kit_sale.rst
index 840c7c3172..b70ab372f2 100644
--- a/modules/product_kit/tests/scenario_product_kit_sale.rst
+++ b/modules/product_kit/tests/scenario_product_kit_sale.rst
@@ -11,30 +11,24 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate product_kit, sale and account_invoice::
 
     >>> config = activate_modules(
     ...     ['product_kit', 'sale', 'account_invoice',
-    ...         'account_invoice_stock'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    ...         'account_invoice_stock'],
+    ...     create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create party::
 
diff --git a/modules/production/tests/scenario_production.rst b/modules/production/tests/scenario_production.rst
index 4bfe0fc984..73c2441fc3 100644
--- a/modules/production/tests/scenario_production.rst
+++ b/modules/production/tests/scenario_production.rst
@@ -8,7 +8,7 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, assertNotEqual
 
     >>> today = dt.date.today()
@@ -17,12 +17,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('production')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('production', create_company)
 
 Create product::
 
diff --git a/modules/production/tests/scenario_production_by_product.rst b/modules/production/tests/scenario_production_by_product.rst
index 343724b7e9..f5a639097b 100644
--- a/modules/production/tests/scenario_production_by_product.rst
+++ b/modules/production/tests/scenario_production_by_product.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('production')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('production', create_company)
 
 Create main product::
 
diff --git a/modules/production/tests/scenario_production_lot_number.rst b/modules/production/tests/scenario_production_lot_number.rst
index 1e1d29cbf7..e4a036886b 100644
--- a/modules/production/tests/scenario_production_lot_number.rst
+++ b/modules/production/tests/scenario_production_lot_number.rst
@@ -7,12 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules(['stock_lot', 'production'])
+    >>> config = activate_modules(['stock_lot', 'production'], create_company)
 
     >>> ProductTemplate = Model.get('product.template')
     >>> Production = Model.get('production')
@@ -21,11 +21,6 @@ Activate modules::
     >>> SequenceType = Model.get('ir.sequence.type')
     >>> UoM = Model.get('product.uom')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create lot sequence::
 
     >>> sequence_type, = SequenceType.find(
diff --git a/modules/production/tests/scenario_production_lot_trace.rst b/modules/production/tests/scenario_production_lot_trace.rst
index 4a728bf924..ffdc283b36 100644
--- a/modules/production/tests/scenario_production_lot_trace.rst
+++ b/modules/production/tests/scenario_production_lot_trace.rst
@@ -7,12 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules(['stock_lot', 'production'])
+    >>> config = activate_modules(['stock_lot', 'production'], create_company)
 
     >>> Lot = Model.get('stock.lot')
     >>> LotTrace = Model.get('stock.lot.trace')
@@ -20,11 +20,6 @@ Activate modules::
     >>> Production = Model.get('production')
     >>> UoM = Model.get('product.uom')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create product::
 
     >>> unit, = UoM.find([('name', '=', 'Unit')])
diff --git a/modules/production/tests/scenario_production_no_list_price.rst b/modules/production/tests/scenario_production_no_list_price.rst
index d1c6638265..7dcfb84dda 100644
--- a/modules/production/tests/scenario_production_no_list_price.rst
+++ b/modules/production/tests/scenario_production_no_list_price.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('production')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('production', create_company)
 
 Create main product::
 
diff --git a/modules/production/tests/scenario_production_rounding.rst b/modules/production/tests/scenario_production_rounding.rst
index 64e5b82e89..ee77dc1a01 100644
--- a/modules/production/tests/scenario_production_rounding.rst
+++ b/modules/production/tests/scenario_production_rounding.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('production')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('production', create_company)
 
 Create product::
 
diff --git a/modules/production/tests/scenario_production_set_cost.rst b/modules/production/tests/scenario_production_set_cost.rst
index 3de046bd89..75de7fc8e7 100644
--- a/modules/production/tests/scenario_production_set_cost.rst
+++ b/modules/production/tests/scenario_production_set_cost.rst
@@ -8,16 +8,12 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('production')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('production', create_company)
 
 Create main product::
 
@@ -71,7 +67,7 @@ Make a production with 2 unused component::
     >>> output.product = component
     >>> output.quantity = 2
     >>> output.unit_price = Decimal(0)
-    >>> output.currency = company.currency
+    >>> output.currency = get_currency()
     >>> output.from_location = production.location
     >>> output.to_location = production.warehouse.storage_location
     >>> production.click('do')
@@ -96,11 +92,10 @@ Change cost of input::
 Launch cron task::
 
     >>> Cron = Model.get('ir.cron')
-    >>> Company = Model.get('company.company')
     >>> cron_set_cost, = Cron.find([
     ...     ('method', '=', 'production|set_cost_from_moves'),
     ...     ])
-    >>> cron_set_cost.companies.append(Company(company.id))
+    >>> cron_set_cost.companies.append(get_company())
     >>> cron_set_cost.click('run_once')
 
     >>> production.reload()
diff --git a/modules/production/tests/scenario_production_waste.rst b/modules/production/tests/scenario_production_waste.rst
index 9006f95193..60fdcced62 100644
--- a/modules/production/tests/scenario_production_waste.rst
+++ b/modules/production/tests/scenario_production_waste.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('production')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('production', create_company)
 
 Create main product::
 
@@ -75,7 +70,7 @@ Create outputs including waste products::
     >>> output.from_location = production.location
     >>> output.to_location = warehouse_loc.storage_location
     >>> output.unit_price = Decimal('0')
-    >>> output.currency = company.currency
+    >>> output.currency = production.company.currency
     >>> waste_output = production.outputs.new()
     >>> waste_output.quantity = 1.0
     >>> waste_output.product = product
diff --git a/modules/production_outsourcing/tests/scenario_production_outsourcing.rst b/modules/production_outsourcing/tests/scenario_production_outsourcing.rst
index 0de7f84aa4..842f4df274 100644
--- a/modules/production_outsourcing/tests/scenario_production_outsourcing.rst
+++ b/modules/production_outsourcing/tests/scenario_production_outsourcing.rst
@@ -8,22 +8,17 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('production_outsourcing')
+    >>> config = activate_modules(
+    ...     'production_outsourcing', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
 
 Create supplier::
diff --git a/modules/production_routing/tests/scenario_stock_supply_production.rst b/modules/production_routing/tests/scenario_stock_supply_production.rst
index 833416e4f9..880c769538 100644
--- a/modules/production_routing/tests/scenario_stock_supply_production.rst
+++ b/modules/production_routing/tests/scenario_stock_supply_production.rst
@@ -7,18 +7,13 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Wizard
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['stock_supply_production', 'production_routing'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    ...     ['stock_supply_production', 'production_routing'], create_company)
 
 Create product::
 
diff --git a/modules/production_split/tests/scenario_production_split.rst b/modules/production_split/tests/scenario_production_split.rst
index 79b2402081..bf5e798e38 100644
--- a/modules/production_split/tests/scenario_production_split.rst
+++ b/modules/production_split/tests/scenario_production_split.rst
@@ -7,22 +7,17 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('production_split')
+    >>> config = activate_modules('production_split', create_company)
 
     >>> ProductTemplate = Model.get('product.template')
     >>> ProductUom = Model.get('product.uom')
     >>> Production = Model.get('production')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create product::
 
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
diff --git a/modules/production_work/tests/scenario_production_work.rst b/modules/production_work/tests/scenario_production_work.rst
index 6bbb6e55f2..de32f677b6 100644
--- a/modules/production_work/tests/scenario_production_work.rst
+++ b/modules/production_work/tests/scenario_production_work.rst
@@ -8,25 +8,20 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, set_user
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('production_work')
+    >>> config = activate_modules('production_work', create_company)
 
     >>> Employee = Model.get('company.employee')
     >>> Group = Model.get('res.group')
     >>> Party = Model.get('party.party')
     >>> User = Model.get('res.user')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create product::
 
     >>> ProductUom = Model.get('product.uom')
diff --git a/modules/project/tests/scenario_project_status.rst b/modules/project/tests/scenario_project_status.rst
index 9a2e7fe8bb..1cd5795d43 100644
--- a/modules/project/tests/scenario_project_status.rst
+++ b/modules/project/tests/scenario_project_status.rst
@@ -10,11 +10,7 @@ Imports::
 
 Activate project::
 
-    >>> config = activate_modules('project')
-
-Create a company::
-
-    >>> _ = create_company()
+    >>> config = activate_modules('project', create_company)
 
 Create status::
 
diff --git a/modules/project_invoice/tests/scenario_project_invoice_effort.rst b/modules/project_invoice/tests/scenario_project_invoice_effort.rst
index 0f058490f5..bbad1b3534 100644
--- a/modules/project_invoice/tests/scenario_project_invoice_effort.rst
+++ b/modules/project_invoice/tests/scenario_project_invoice_effort.rst
@@ -10,17 +10,12 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
     >>> from trytond.modules.account_invoice.tests.tools import create_payment_term
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, set_user
 
 Activate modules::
 
-    >>> config = activate_modules('project_invoice')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('project_invoice', create_company, create_chart)
 
 Create project user::
 
@@ -45,10 +40,9 @@ Create project invoice user::
     ...     [project_invoice_group, project_group])
     >>> project_invoice_user.save()
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create payment term::
@@ -70,7 +64,6 @@ Create employee::
     >>> party = Party(name='Employee')
     >>> party.save()
     >>> employee.party = party
-    >>> employee.company = company
     >>> employee.save()
 
 Create account category::
diff --git a/modules/project_invoice/tests/scenario_project_invoice_multiple_party.rst b/modules/project_invoice/tests/scenario_project_invoice_multiple_party.rst
index 137b2345d3..c602852497 100644
--- a/modules/project_invoice/tests/scenario_project_invoice_multiple_party.rst
+++ b/modules/project_invoice/tests/scenario_project_invoice_multiple_party.rst
@@ -9,22 +9,16 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('project_invoice')
+    >>> config = activate_modules('project_invoice', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create two customers::
diff --git a/modules/project_invoice/tests/scenario_project_invoice_progress.rst b/modules/project_invoice/tests/scenario_project_invoice_progress.rst
index 6567fc6d07..22d5a7eef5 100644
--- a/modules/project_invoice/tests/scenario_project_invoice_progress.rst
+++ b/modules/project_invoice/tests/scenario_project_invoice_progress.rst
@@ -10,17 +10,12 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
     >>> from trytond.modules.account_invoice.tests.tools import create_payment_term
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, set_user
 
 Activate modules::
 
-    >>> config = activate_modules('project_invoice')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('project_invoice', create_company, create_chart)
 
 Create project user::
 
@@ -45,10 +40,9 @@ Create project invoice user::
     ...     [project_invoice_group, project_group])
     >>> project_invoice_user.save()
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create payment term::
@@ -70,7 +64,6 @@ Create employee::
     >>> party = Party(name='Employee')
     >>> party.save()
     >>> employee.party = party
-    >>> employee.company = company
     >>> employee.save()
 
 Create account category::
diff --git a/modules/project_invoice/tests/scenario_project_invoice_timesheet.rst b/modules/project_invoice/tests/scenario_project_invoice_timesheet.rst
index 18225f5aa6..fb75eae210 100644
--- a/modules/project_invoice/tests/scenario_project_invoice_timesheet.rst
+++ b/modules/project_invoice/tests/scenario_project_invoice_timesheet.rst
@@ -10,7 +10,7 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
     >>> from trytond.modules.account_invoice.tests.tools import create_payment_term
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, set_user
 
     >>> today = dt.date.today()
@@ -18,12 +18,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('project_invoice')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('project_invoice', create_company, create_chart)
 
 Create project user::
 
@@ -49,10 +44,9 @@ Create project invoice user::
     ...     [project_invoice_group, project_group, invoice_group])
     >>> project_invoice_user.save()
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create payment term::
@@ -74,7 +68,6 @@ Create employee::
     >>> party = Party(name='Employee')
     >>> party.save()
     >>> employee.party = party
-    >>> employee.company = company
     >>> employee.save()
 
 Create account category::
diff --git a/modules/project_revenue/tests/scenario_project_revenue.rst b/modules/project_revenue/tests/scenario_project_revenue.rst
index 72025d9237..a2776bf89c 100644
--- a/modules/project_revenue/tests/scenario_project_revenue.rst
+++ b/modules/project_revenue/tests/scenario_project_revenue.rst
@@ -8,17 +8,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('project_revenue')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('project_revenue', create_company)
 
 Create customer::
 
@@ -33,7 +28,6 @@ Create employee::
     >>> party = Party(name='Employee')
     >>> party.save()
     >>> employee.party = party
-    >>> employee.company = company
     >>> _ = employee.cost_prices.new(cost_price=Decimal('10.00'))
     >>> employee.save()
     >>> employee.cost_price
diff --git a/modules/purchase/tests/scenario_purchase.rst b/modules/purchase/tests/scenario_purchase.rst
index 191dce3989..b14759d648 100644
--- a/modules/purchase/tests/scenario_purchase.rst
+++ b/modules/purchase/tests/scenario_purchase.rst
@@ -12,19 +12,14 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, set_user
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('purchase')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('purchase', create_company, create_chart)
 
 Set employee::
 
@@ -44,13 +39,12 @@ Set employee::
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
     >>> cash = accounts['cash']
diff --git a/modules/purchase/tests/scenario_purchase_copy_product_suppliers.rst b/modules/purchase/tests/scenario_purchase_copy_product_suppliers.rst
index 3a31cb6475..20727d9cf5 100644
--- a/modules/purchase/tests/scenario_purchase_copy_product_suppliers.rst
+++ b/modules/purchase/tests/scenario_purchase_copy_product_suppliers.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('purchase')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('purchase', create_company)
 
 Create party::
 
diff --git a/modules/purchase/tests/scenario_purchase_default_taxes.rst b/modules/purchase/tests/scenario_purchase_default_taxes.rst
index bb5cf3d5fd..4f42173258 100644
--- a/modules/purchase/tests/scenario_purchase_default_taxes.rst
+++ b/modules/purchase/tests/scenario_purchase_default_taxes.rst
@@ -14,19 +14,14 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('purchase')
+    >>> config = activate_modules('purchase', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> Purchase = Model.get('purchase.purchase')
     >>> Tax = Model.get('account.tax')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create tax::
diff --git a/modules/purchase/tests/scenario_purchase_empty.rst b/modules/purchase/tests/scenario_purchase_empty.rst
index 2cf0e53375..fbfda9e083 100644
--- a/modules/purchase/tests/scenario_purchase_empty.rst
+++ b/modules/purchase/tests/scenario_purchase_empty.rst
@@ -6,21 +6,12 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('purchase')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
+    >>> config = activate_modules('purchase', create_company, create_chart)
 
 Create parties::
 
diff --git a/modules/purchase/tests/scenario_purchase_line_cancelled.rst b/modules/purchase/tests/scenario_purchase_line_cancelled.rst
index c08306adb1..a01500d367 100644
--- a/modules/purchase/tests/scenario_purchase_line_cancelled.rst
+++ b/modules/purchase/tests/scenario_purchase_line_cancelled.rst
@@ -13,7 +13,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('purchase')
+    >>> config = activate_modules('purchase', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -21,13 +21,8 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Purchase = Model.get('purchase.purchase')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create party::
diff --git a/modules/purchase/tests/scenario_purchase_line_cancelled_on_shipment.rst b/modules/purchase/tests/scenario_purchase_line_cancelled_on_shipment.rst
index 13ce633bc2..4f1ddd65b2 100644
--- a/modules/purchase/tests/scenario_purchase_line_cancelled_on_shipment.rst
+++ b/modules/purchase/tests/scenario_purchase_line_cancelled_on_shipment.rst
@@ -13,7 +13,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('purchase')
+    >>> config = activate_modules('purchase', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -21,13 +21,8 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Purchase = Model.get('purchase.purchase')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create party::
diff --git a/modules/purchase/tests/scenario_purchase_manual_invoice.rst b/modules/purchase/tests/scenario_purchase_manual_invoice.rst
index 5a5ebb88e9..7fe09eb2f4 100644
--- a/modules/purchase/tests/scenario_purchase_manual_invoice.rst
+++ b/modules/purchase/tests/scenario_purchase_manual_invoice.rst
@@ -13,7 +13,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('purchase')
+    >>> config = activate_modules('purchase', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -21,13 +21,8 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Purchase = Model.get('purchase.purchase')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create party::
diff --git a/modules/purchase/tests/scenario_purchase_modify_header.rst b/modules/purchase/tests/scenario_purchase_modify_header.rst
index 3d10eba347..fb0882dbfc 100644
--- a/modules/purchase/tests/scenario_purchase_modify_header.rst
+++ b/modules/purchase/tests/scenario_purchase_modify_header.rst
@@ -9,22 +9,16 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_tax, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('purchase')
+    >>> config = activate_modules('purchase', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
 
 Create tax and tax rule::
@@ -33,7 +27,7 @@ Create tax and tax rule::
     >>> tax.save()
 
     >>> TaxRule = Model.get('account.tax.rule')
-    >>> foreign = TaxRule(name='Foreign Suppliers', company=company)
+    >>> foreign = TaxRule(name='Foreign Suppliers')
     >>> no_tax = foreign.lines.new()
     >>> no_tax.origin_tax = tax
     >>> foreign.save()
diff --git a/modules/purchase/tests/scenario_purchase_reporting.rst b/modules/purchase/tests/scenario_purchase_reporting.rst
index dcdb434319..2eac40d8c3 100644
--- a/modules/purchase/tests/scenario_purchase_reporting.rst
+++ b/modules/purchase/tests/scenario_purchase_reporting.rst
@@ -13,12 +13,13 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('purchase')
+    >>> config = activate_modules('purchase', create_company, create_chart)
+
     >>> Party = Model.get('party.party')
     >>> ProductUom = Model.get('product.uom')
     >>> ProductTemplate = Model.get('product.template')
@@ -29,21 +30,14 @@ Activate modules::
     >>> Product = Model.get('purchase.reporting.product')
     >>> ProductTimeseries = Model.get('purchase.reporting.product.time_series')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
 
 Create parties::
diff --git a/modules/purchase/tests/scenario_purchase_return_wizard.rst b/modules/purchase/tests/scenario_purchase_return_wizard.rst
index 8888886efc..e67615c3d1 100644
--- a/modules/purchase/tests/scenario_purchase_return_wizard.rst
+++ b/modules/purchase/tests/scenario_purchase_return_wizard.rst
@@ -11,28 +11,21 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('purchase')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('purchase', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
 
 Create parties::
diff --git a/modules/purchase_amendment/tests/scenario_purchase_amendment.rst b/modules/purchase_amendment/tests/scenario_purchase_amendment.rst
index 5c3ad3db91..e102d06cb2 100644
--- a/modules/purchase_amendment/tests/scenario_purchase_amendment.rst
+++ b/modules/purchase_amendment/tests/scenario_purchase_amendment.rst
@@ -11,28 +11,21 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('purchase_amendment')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('purchase_amendment', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/purchase_blanket_agreement/tests/scenario_purchase_blanket_agreement.rst b/modules/purchase_blanket_agreement/tests/scenario_purchase_blanket_agreement.rst
index 07ac6d7dd7..a35faca3db 100644
--- a/modules/purchase_blanket_agreement/tests/scenario_purchase_blanket_agreement.rst
+++ b/modules/purchase_blanket_agreement/tests/scenario_purchase_blanket_agreement.rst
@@ -9,7 +9,7 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -18,7 +18,8 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('purchase_blanket_agreement')
+    >>> config = activate_modules(
+    ...     'purchase_blanket_agreement', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -27,15 +28,9 @@ Activate modules::
     >>> PurchaseBlanketAgreement = Model.get('purchase.blanket_agreement')
     >>> Purchase = Model.get('purchase.purchase')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create supplier::
 
diff --git a/modules/purchase_history/tests/scenario_purchase_history.rst b/modules/purchase_history/tests/scenario_purchase_history.rst
index 8fc1a093dc..7497cc9aa0 100644
--- a/modules/purchase_history/tests/scenario_purchase_history.rst
+++ b/modules/purchase_history/tests/scenario_purchase_history.rst
@@ -5,17 +5,12 @@ Purchase History Scenario
 Imports::
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('purchase_history')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('purchase_history', create_company)
 
 Create supplier::
 
diff --git a/modules/purchase_invoice_line_standalone/tests/scenario_purchase_invoice_line_not_standalone.rst b/modules/purchase_invoice_line_standalone/tests/scenario_purchase_invoice_line_not_standalone.rst
index e091019b2d..5299b87cdf 100644
--- a/modules/purchase_invoice_line_standalone/tests/scenario_purchase_invoice_line_not_standalone.rst
+++ b/modules/purchase_invoice_line_standalone/tests/scenario_purchase_invoice_line_not_standalone.rst
@@ -16,7 +16,8 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('purchase_invoice_line_standalone')
+    >>> config = activate_modules(
+    ...     'purchase_invoice_line_standalone', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -24,18 +25,13 @@ Activate modules::
     >>> ProductTemplate = Model.get('product.template')
     >>> Purchase = Model.get('purchase.purchase')
 
-Create company::
-
-    >>> _ = create_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create parties::
diff --git a/modules/purchase_invoice_line_standalone/tests/scenario_purchase_invoice_line_standalone.rst b/modules/purchase_invoice_line_standalone/tests/scenario_purchase_invoice_line_standalone.rst
index 37b8457cb9..5db02fd259 100644
--- a/modules/purchase_invoice_line_standalone/tests/scenario_purchase_invoice_line_standalone.rst
+++ b/modules/purchase_invoice_line_standalone/tests/scenario_purchase_invoice_line_standalone.rst
@@ -11,17 +11,13 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, set_user
 
 Activate modules::
 
-    >>> current_config = activate_modules('purchase_invoice_line_standalone')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> current_config = activate_modules(
+    ...     'purchase_invoice_line_standalone', create_company, create_chart)
 
 Create an accountant user::
 
@@ -36,14 +32,12 @@ Create an accountant user::
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
diff --git a/modules/purchase_price_list/tests/scenario_purchase_price_list.rst b/modules/purchase_price_list/tests/scenario_purchase_price_list.rst
index cbcb30631e..615e48b890 100644
--- a/modules/purchase_price_list/tests/scenario_purchase_price_list.rst
+++ b/modules/purchase_price_list/tests/scenario_purchase_price_list.rst
@@ -12,7 +12,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('purchase_price_list')
+    >>> config = activate_modules('purchase_price_list', create_company)
 
     >>> Party = Model.get('party.party')
     >>> PriceList = Model.get('product.price_list')
@@ -20,10 +20,6 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Purchase = Model.get('purchase.purchase')
 
-Create company::
-
-    >>> _ = create_company()
-
 Create supplier::
 
     >>> supplier = Party(name="Supplier")
diff --git a/modules/purchase_product_quantity/tests/scenario_purchase_product_quantity.rst b/modules/purchase_product_quantity/tests/scenario_purchase_product_quantity.rst
index bc1eb65645..f5c7213197 100644
--- a/modules/purchase_product_quantity/tests/scenario_purchase_product_quantity.rst
+++ b/modules/purchase_product_quantity/tests/scenario_purchase_product_quantity.rst
@@ -8,13 +8,14 @@ Imports::
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, set_user
 
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['purchase_product_quantity', 'purchase_request'])
+    ...     ['purchase_product_quantity', 'purchase_request'],
+    ...     create_company, create_chart)
     >>> user = config.user
 
     >>> Location = Model.get('stock.location')
@@ -24,15 +25,9 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> PurchaseRequest = Model.get('purchase.request')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create parties::
 
@@ -74,14 +69,14 @@ Get stock locations::
 
 Create the purchase request below minimal::
 
+    >>> ctx = config.context
     >>> set_user(0)
     >>> pr_id, = PurchaseRequest.create([{
     ...             'product': product.id,
     ...             'quantity': 30,
     ...             'unit': gr,
     ...             'warehouse': warehouse_loc.id,
-    ...             'company': company.id,
-    ...             }], config.context)
+    ...             }], ctx)
     >>> set_user(user)
     >>> purchase_request = PurchaseRequest(pr_id)
 
@@ -100,14 +95,14 @@ Create purchase::
 
 Create the purchase request wrong rounding::
 
+    >>> ctx = config.context
     >>> set_user(0)
     >>> pr_id, = PurchaseRequest.create([{
     ...             'product': product.id,
     ...             'quantity': 1001,
     ...             'unit': gr,
     ...             'warehouse': warehouse_loc.id,
-    ...             'company': company.id,
-    ...             }], config.context)
+    ...             }], ctx)
     >>> set_user(user)
     >>> purchase_request = PurchaseRequest(pr_id)
 
diff --git a/modules/purchase_request/tests/scenario_purchase_request.rst b/modules/purchase_request/tests/scenario_purchase_request.rst
index 2317b5ed79..9b80aac9bc 100644
--- a/modules/purchase_request/tests/scenario_purchase_request.rst
+++ b/modules/purchase_request/tests/scenario_purchase_request.rst
@@ -9,24 +9,20 @@ Imports::
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, set_user
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules(['purchase_request', 'stock_supply'])
+    >>> config = activate_modules(
+    ...     ['purchase_request', 'stock_supply'],
+    ...     create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
 
 Create parties::
@@ -127,16 +123,15 @@ Create a need for missing product::
     >>> shipment_out.effective_date = today
     >>> shipment_out.customer = customer
     >>> shipment_out.warehouse = warehouse_loc
-    >>> shipment_out.company = company
     >>> move = shipment_out.outgoing_moves.new()
     >>> move.product = product
     >>> move.unit = unit
     >>> move.quantity = 1
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
-    >>> move.company = company
+    >>> move.company = shipment_out.company
     >>> move.unit_price = Decimal('1')
-    >>> move.currency = company.currency
+    >>> move.currency = shipment_out.company.currency
     >>> shipment_out.click('wait')
 
 There is no purchase request::
@@ -210,6 +205,7 @@ Re-create the purchase request::
 
 Create a second purchase request manually::
 
+    >>> ctx = config.context
     >>> set_user(0)  # root
     >>> pr_id, = PurchaseRequest.create([{
     ...             'product': product.id,
@@ -217,8 +213,7 @@ Create a second purchase request manually::
     ...             'unit': unit,
     ...             'warehouse': warehouse_loc.id,
     ...             'origin': 'stock.order_point,-1',
-    ...             'company': company.id,
-    ...             }], config.context)
+    ...             }], ctx)
     >>> pr = PurchaseRequest(pr_id)
 
 There is now 2 draft purchase requests::
@@ -246,13 +241,13 @@ Create the purchase with a unique line::
 
 Create a purchase request without product::
 
+    >>> ctx = config.context
     >>> set_user(0)  # root
     >>> pr_id, = PurchaseRequest.create([{
     ...             'description': "Custom product",
     ...             'quantity': 1,
     ...             'origin': 'stock.order_point,-1',
-    ...             'company': company.id,
-    ...             }], config.context)
+    ...             }], ctx)
     >>> pr = PurchaseRequest(pr_id)
     >>> pr.save()
 
diff --git a/modules/purchase_request_quotation/tests/scenario_purchase_request_quotation.rst b/modules/purchase_request_quotation/tests/scenario_purchase_request_quotation.rst
index cf87357b44..f4258d6dbe 100644
--- a/modules/purchase_request_quotation/tests/scenario_purchase_request_quotation.rst
+++ b/modules/purchase_request_quotation/tests/scenario_purchase_request_quotation.rst
@@ -9,25 +9,20 @@ Imports::
 
     >>> from proteus import Model, Report, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, set_user
 
     >>> today = dt.date.today()
 
 Activate purchase_request_quotation Module::
 
-    >>> config = activate_modules(['purchase_request_quotation',
-    ...     'purchase_requisition'])
+    >>> config = activate_modules(
+    ...     ['purchase_request_quotation', 'purchase_requisition'],
+    ...     create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
 
 Create purchase user which is also in requisition approval group::
diff --git a/modules/purchase_requisition/tests/scenario_purchase_requisition.rst b/modules/purchase_requisition/tests/scenario_purchase_requisition.rst
index b3f2f024a7..60b1075658 100644
--- a/modules/purchase_requisition/tests/scenario_purchase_requisition.rst
+++ b/modules/purchase_requisition/tests/scenario_purchase_requisition.rst
@@ -9,24 +9,18 @@ Imports::
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, set_user
 
     >>> today = dt.date.today()
 
 Activate purchase_requisition Module::
 
-    >>> config = activate_modules(['purchase_requisition'])
+    >>> config = activate_modules('purchase_requisition', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
 
 Create purchase requisition user::
diff --git a/modules/purchase_secondary_unit/tests/scenario_purchase_blanket_agreement_secondary_unit.rst b/modules/purchase_secondary_unit/tests/scenario_purchase_blanket_agreement_secondary_unit.rst
index 107bc33b33..4075180f85 100644
--- a/modules/purchase_secondary_unit/tests/scenario_purchase_blanket_agreement_secondary_unit.rst
+++ b/modules/purchase_secondary_unit/tests/scenario_purchase_blanket_agreement_secondary_unit.rst
@@ -9,7 +9,7 @@ Imports::
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -18,8 +18,9 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules([
-    ...         'purchase_secondary_unit', 'purchase_blanket_agreement'])
+    >>> config = activate_modules(
+    ...     ['purchase_secondary_unit', 'purchase_blanket_agreement'],
+    ...     create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -27,15 +28,9 @@ Activate modules::
     >>> ProductTemplate = Model.get('product.template')
     >>> PurchaseBlanketAgreement = Model.get('purchase.blanket_agreement')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create supplier::
 
diff --git a/modules/purchase_secondary_unit/tests/scenario_purchase_requisition_secondary_unit.rst b/modules/purchase_secondary_unit/tests/scenario_purchase_requisition_secondary_unit.rst
index c1c8ceaf38..477c1bbe71 100644
--- a/modules/purchase_secondary_unit/tests/scenario_purchase_requisition_secondary_unit.rst
+++ b/modules/purchase_secondary_unit/tests/scenario_purchase_requisition_secondary_unit.rst
@@ -9,7 +9,7 @@ Imports::
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -19,7 +19,8 @@ Activate modules::
     >>> config = activate_modules([
     ...         'purchase_secondary_unit',
     ...         'purchase_request',
-    ...         'purchase_requisition'])
+    ...         'purchase_requisition'],
+    ...     create_company, create_chart)
 
     >>> Employee = Model.get('company.employee')
     >>> Party = Model.get('party.party')
@@ -29,15 +30,9 @@ Activate modules::
     >>> PurchaseRequest = Model.get('purchase.request')
     >>> PurchaseRequisition = Model.get('purchase.requisition')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create employee::
 
diff --git a/modules/purchase_secondary_unit/tests/scenario_purchase_secondary_unit.rst b/modules/purchase_secondary_unit/tests/scenario_purchase_secondary_unit.rst
index ceb91f4c64..3a85f5e428 100644
--- a/modules/purchase_secondary_unit/tests/scenario_purchase_secondary_unit.rst
+++ b/modules/purchase_secondary_unit/tests/scenario_purchase_secondary_unit.rst
@@ -8,7 +8,7 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
@@ -17,17 +17,12 @@ Activate modules::
     ...         'purchase_amendment',
     ...         'purchase_secondary_unit',
     ...         'account_invoice_secondary_unit',
-    ...         'stock_secondary_unit'])
+    ...         'stock_secondary_unit'],
+    ...     create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create supplier::
 
diff --git a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost.rst b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost.rst
index 0fe8ae2f5b..4c05ed8b47 100644
--- a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost.rst
+++ b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('purchase_shipment_cost')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('purchase_shipment_cost', create_company)
 
 Create supplier::
 
@@ -78,11 +73,11 @@ Receive a single product line::
     >>> move.product = product
     >>> move.quantity = 50
     >>> move.unit_price = Decimal('8')
-    >>> move.currency = company.currency
+    >>> move.currency = shipment.company.currency
     >>> shipment.carrier = carrier
     >>> shipment.cost_used
     Decimal('3.0000')
-    >>> assertEqual(shipment.cost_currency_used, company.currency)
+    >>> assertEqual(shipment.cost_currency_used, shipment.company.currency)
     >>> shipment.click('receive')
     >>> shipment.state
     'received'
@@ -102,7 +97,7 @@ Receive many product lines::
     ...     move.product = product
     ...     move.quantity = quantity
     ...     move.unit_price = Decimal('8')
-    ...     move.currency = company.currency
+    ...     move.currency = shipment.company.currency
     >>> shipment.carrier = carrier
     >>> shipment.cost_used
     Decimal('3.0000')
@@ -122,14 +117,14 @@ Receive a two lines with no cost::
     >>> move.product = product
     >>> move.quantity = 75
     >>> move.unit_price = Decimal('0.0')
-    >>> move.currency = company.currency
+    >>> move.currency = shipment.company.currency
     >>> move = shipment.incoming_moves.new()
     >>> move.from_location = supplier_location
     >>> move.to_location = shipment.warehouse.input_location
     >>> move.product = product
     >>> move.quantity = 25
     >>> move.unit_price = Decimal('0.0')
-    >>> move.currency = company.currency
+    >>> move.currency = shipment.company.currency
     >>> shipment.carrier = carrier
     >>> shipment.cost_used
     Decimal('3.0000')
diff --git a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_invoice_stock.rst b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_invoice_stock.rst
index df7794fd08..9c53167351 100644
--- a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_invoice_stock.rst
+++ b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_invoice_stock.rst
@@ -12,7 +12,7 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
@@ -23,7 +23,8 @@ Activate modules::
     ...         'purchase_shipment_cost',
     ...         'account_invoice_stock',
     ...         'purchase',
-    ...         ])
+    ...         ],
+    ...     create_company, create_chart)
 
     >>> Carrier = Model.get('carrier')
     >>> Move = Model.get('stock.move')
@@ -34,20 +35,14 @@ Activate modules::
     >>> Purchase = Model.get('purchase.purchase')
     >>> ShipmentIn = Model.get('stock.shipment.in')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
 Create account categories::
diff --git a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock.rst b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock.rst
index f0c3b0ed4f..b8083fe1c5 100644
--- a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock.rst
+++ b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock.rst
@@ -11,7 +11,7 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_stock_continental.tests.tools import (
     ...     add_stock_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
@@ -19,23 +19,18 @@ Activate modules::
     >>> config = activate_modules([
     ...         'purchase_shipment_cost',
     ...         'account_stock_continental',
-    ...         ])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    ...         ],
+    ...     create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = create_fiscalyear(company)
+    >>> fiscalyear = create_fiscalyear()
     >>> fiscalyear.account_stock_method = 'continental'
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_stock_accounts(get_accounts(company), company)
+    >>> accounts = add_stock_accounts(get_accounts())
     >>> receivable = accounts['receivable']
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
@@ -125,7 +120,7 @@ Receive a single product line::
     >>> move.product = product
     >>> move.quantity = 30
     >>> move.unit_price = Decimal('8')
-    >>> move.currency = company.currency
+    >>> move.currency = shipment.company.currency
     >>> move = Move()
     >>> shipment.incoming_moves.append(move)
     >>> move.from_location = supplier_location
@@ -133,11 +128,11 @@ Receive a single product line::
     >>> move.product = product_average
     >>> move.quantity = 20
     >>> move.unit_price = Decimal('8')
-    >>> move.currency = company.currency
+    >>> move.currency = shipment.company.currency
     >>> shipment.carrier = carrier
     >>> shipment.cost_used
     Decimal('3.0000')
-    >>> assertEqual(shipment.cost_currency_used, company.currency)
+    >>> assertEqual(shipment.cost_currency_used, shipment.company.currency)
     >>> shipment.click('receive')
     >>> shipment.state
     'received'
@@ -168,7 +163,7 @@ Receive many product lines::
     ...     move.product = product
     ...     move.quantity = quantity
     ...     move.unit_price = Decimal('8')
-    ...     move.currency = company.currency
+    ...     move.currency = shipment.company.currency
     >>> shipment.carrier = carrier
     >>> shipment.cost_used
     Decimal('3.0000')
diff --git a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
index 4c2570bdec..b64869b2e2 100644
--- a/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
+++ b/modules/purchase_shipment_cost/tests/scenario_purchase_shipment_cost_with_account_stock_anglo_saxon.rst
@@ -16,7 +16,7 @@ Imports::
     ...     add_cogs_accounts)
     >>> from trytond.modules.account_stock_continental.tests.tools import (
     ...     add_stock_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -27,25 +27,19 @@ Activate modules::
     ...         'purchase_shipment_cost',
     ...         'account_stock_anglo_saxon',
     ...         'purchase',
-    ...         ])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    ...         ],
+    ...     create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.account_stock_method = 'anglo_saxon'
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_cogs_accounts(add_stock_accounts(
-    ...         get_accounts(company), company), company)
+    >>> accounts = add_cogs_accounts(add_stock_accounts(get_accounts()))
     >>> receivable = accounts['receivable']
     >>> payable = accounts['payable']
     >>> revenue = accounts['revenue']
@@ -150,7 +144,7 @@ Receive 4 products::
     >>> shipment.carrier = carrier
     >>> shipment.cost_used
     Decimal('3.0000')
-    >>> assertEqual(shipment.cost_currency_used, company.currency)
+    >>> assertEqual(shipment.cost_currency_used, shipment.company.currency)
     >>> shipment.click('receive')
     >>> shipment.state
     'received'
diff --git a/modules/quality/tests/scenario_quality_control_shipment.rst b/modules/quality/tests/scenario_quality_control_shipment.rst
index 2b67dbc42c..0cece0149c 100644
--- a/modules/quality/tests/scenario_quality_control_shipment.rst
+++ b/modules/quality/tests/scenario_quality_control_shipment.rst
@@ -12,7 +12,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules(['quality', 'stock'])
+    >>> config = activate_modules(['quality', 'stock'], create_company)
 
     >>> Control = Model.get('quality.control')
     >>> Inspection = Model.get('quality.inspection')
@@ -21,10 +21,6 @@ Activate modules::
     >>> Shipment = Model.get('stock.shipment.in')
     >>> UoM = Model.get('product.uom')
 
-Create company::
-
-    >>> _ = create_company()
-
 Create party::
 
     >>> supplier = Party(name="Supplier")
diff --git a/modules/quality/tests/scenario_quality_inspection.rst b/modules/quality/tests/scenario_quality_inspection.rst
index 8e4c73771a..d0abcd189c 100644
--- a/modules/quality/tests/scenario_quality_inspection.rst
+++ b/modules/quality/tests/scenario_quality_inspection.rst
@@ -10,15 +10,11 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('quality')
+    >>> config = activate_modules('quality', create_company)
 
     >>> Control = Model.get('quality.control')
     >>> Inspection = Model.get('quality.inspection')
 
-Create company::
-
-    >>> _ = create_company()
-
 Create control::
 
     >>> control = Control(name="Test")
diff --git a/modules/sale/tests/scenario_sale.rst b/modules/sale/tests/scenario_sale.rst
index b3f2e01083..7a5399faa4 100644
--- a/modules/sale/tests/scenario_sale.rst
+++ b/modules/sale/tests/scenario_sale.rst
@@ -11,17 +11,12 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, set_user
 
 Activate modules::
 
-    >>> config = activate_modules('sale')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale', create_company, create_chart)
 
 Set employee::
 
@@ -40,14 +35,12 @@ Set employee::
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
     >>> cash = accounts['cash']
diff --git a/modules/sale/tests/scenario_sale_default_methods.rst b/modules/sale/tests/scenario_sale_default_methods.rst
index d99dc52f6f..e025d6a826 100644
--- a/modules/sale/tests/scenario_sale_default_methods.rst
+++ b/modules/sale/tests/scenario_sale_default_methods.rst
@@ -5,17 +5,12 @@ Sale Default Methods Scenario
 Imports::
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale', create_company)
 
 Create a party and set their default methods::
 
diff --git a/modules/sale/tests/scenario_sale_default_taxes.rst b/modules/sale/tests/scenario_sale_default_taxes.rst
index 0f0c204f4c..9c569f5d99 100644
--- a/modules/sale/tests/scenario_sale_default_taxes.rst
+++ b/modules/sale/tests/scenario_sale_default_taxes.rst
@@ -14,19 +14,14 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('sale')
+    >>> config = activate_modules('sale', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> Sale = Model.get('sale.sale')
     >>> Tax = Model.get('account.tax')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create tax::
diff --git a/modules/sale/tests/scenario_sale_empty.rst b/modules/sale/tests/scenario_sale_empty.rst
index 14049d8c66..23a92e0cf8 100644
--- a/modules/sale/tests/scenario_sale_empty.rst
+++ b/modules/sale/tests/scenario_sale_empty.rst
@@ -6,21 +6,12 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
+    >>> config = activate_modules('sale', create_company, create_chart)
 
 Create parties::
 
diff --git a/modules/sale/tests/scenario_sale_line_cancelled.rst b/modules/sale/tests/scenario_sale_line_cancelled.rst
index 60140931ed..770c2c8abe 100644
--- a/modules/sale/tests/scenario_sale_line_cancelled.rst
+++ b/modules/sale/tests/scenario_sale_line_cancelled.rst
@@ -13,7 +13,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('sale')
+    >>> config = activate_modules('sale', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -21,13 +21,8 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create party::
diff --git a/modules/sale/tests/scenario_sale_line_cancelled_on_invoice.rst b/modules/sale/tests/scenario_sale_line_cancelled_on_invoice.rst
index b2a443fc13..eef0addfc0 100644
--- a/modules/sale/tests/scenario_sale_line_cancelled_on_invoice.rst
+++ b/modules/sale/tests/scenario_sale_line_cancelled_on_invoice.rst
@@ -13,7 +13,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('sale')
+    >>> config = activate_modules('sale', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -21,13 +21,8 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create party::
diff --git a/modules/sale/tests/scenario_sale_line_cancelled_on_shipment.rst b/modules/sale/tests/scenario_sale_line_cancelled_on_shipment.rst
index de9a6b5ebf..dc13183b83 100644
--- a/modules/sale/tests/scenario_sale_line_cancelled_on_shipment.rst
+++ b/modules/sale/tests/scenario_sale_line_cancelled_on_shipment.rst
@@ -13,7 +13,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('sale')
+    >>> config = activate_modules('sale', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -21,13 +21,8 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create party::
diff --git a/modules/sale/tests/scenario_sale_manual_invoice.rst b/modules/sale/tests/scenario_sale_manual_invoice.rst
index 46f01d57a3..46c1e50724 100644
--- a/modules/sale/tests/scenario_sale_manual_invoice.rst
+++ b/modules/sale/tests/scenario_sale_manual_invoice.rst
@@ -13,7 +13,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('sale')
+    >>> config = activate_modules('sale', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -21,13 +21,8 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create party::
diff --git a/modules/sale/tests/scenario_sale_manual_shipment.rst b/modules/sale/tests/scenario_sale_manual_shipment.rst
index 0e8b77604a..89e4a27853 100644
--- a/modules/sale/tests/scenario_sale_manual_shipment.rst
+++ b/modules/sale/tests/scenario_sale_manual_shipment.rst
@@ -12,7 +12,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('sale')
+    >>> config = activate_modules('sale', create_company)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -20,10 +20,6 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
-
-    >>> _ = create_company()
-
 Create party::
 
     >>> customer = Party(name="Customer")
diff --git a/modules/sale/tests/scenario_sale_modify_header.rst b/modules/sale/tests/scenario_sale_modify_header.rst
index afbbb671c3..cce0520658 100644
--- a/modules/sale/tests/scenario_sale_modify_header.rst
+++ b/modules/sale/tests/scenario_sale_modify_header.rst
@@ -9,22 +9,16 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_tax, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('sale')
+    >>> config = activate_modules('sale', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create tax and tax rule::
@@ -35,7 +29,7 @@ Create tax and tax rule::
     >>> other_tax.save()
 
     >>> TaxRule = Model.get('account.tax.rule')
-    >>> foreign = TaxRule(name='Foreign Customers', company=company)
+    >>> foreign = TaxRule(name='Foreign Customers')
     >>> foreign_tax = foreign.lines.new()
     >>> foreign_tax.origin_tax = tax
     >>> foreign_tax.tax = other_tax
diff --git a/modules/sale/tests/scenario_sale_reporting.rst b/modules/sale/tests/scenario_sale_reporting.rst
index c1332aea1f..72f9eb0e79 100644
--- a/modules/sale/tests/scenario_sale_reporting.rst
+++ b/modules/sale/tests/scenario_sale_reporting.rst
@@ -13,28 +13,21 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('sale')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/sale_advance_payment/tests/scenario_advance_payment.rst b/modules/sale_advance_payment/tests/scenario_advance_payment.rst
index ba1b8f9888..e93089f134 100644
--- a/modules/sale_advance_payment/tests/scenario_advance_payment.rst
+++ b/modules/sale_advance_payment/tests/scenario_advance_payment.rst
@@ -12,7 +12,7 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.sale_advance_payment.tests.tools import (
     ...     add_advance_payment_accounts, create_advance_payment_term)
     >>> from trytond.tests.tools import activate_modules, assertEqual
@@ -22,23 +22,19 @@ Imports::
 
 Activate sale_advance_payment::
 
-    >>> config = activate_modules(['sale_advance_payment', 'sale_supply'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     ['sale_advance_payment', 'sale_supply'],
+    ...     create_company, create_chart)
 
 Create fiscal years::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, (today, next_week)))
+    ...     create_fiscalyear(today=(today, next_week)))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = add_advance_payment_accounts(get_accounts(company))
+    >>> accounts = add_advance_payment_accounts(get_accounts())
     >>> revenue = accounts['revenue']
     >>> payable = accounts['payable']
     >>> cash = accounts['cash']
diff --git a/modules/sale_advance_payment/tests/scenario_sale_advance_payment_on_shipment.rst b/modules/sale_advance_payment/tests/scenario_sale_advance_payment_on_shipment.rst
index b34a87587e..79adb592c7 100644
--- a/modules/sale_advance_payment/tests/scenario_sale_advance_payment_on_shipment.rst
+++ b/modules/sale_advance_payment/tests/scenario_sale_advance_payment_on_shipment.rst
@@ -11,14 +11,14 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.sale_advance_payment.tests.tools import (
     ...     add_advance_payment_accounts, create_advance_payment_term)
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_advance_payment')
+    >>> config = activate_modules('sale_advance_payment', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Party = Model.get('party.party')
@@ -28,20 +28,13 @@ Activate modules::
     >>> ProductUoM = Model.get('product.uom')
     >>> Sale = Model.get('sale.sale')
 
-Create a company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create a chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = add_advance_payment_accounts(get_accounts(company))
+    >>> accounts = add_advance_payment_accounts(get_accounts())
 
 Create a fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
 Set a payment method::
diff --git a/modules/sale_amendment/tests/scenario_sale_amendment.rst b/modules/sale_amendment/tests/scenario_sale_amendment.rst
index 5b3d1509d4..4c805233dd 100644
--- a/modules/sale_amendment/tests/scenario_sale_amendment.rst
+++ b/modules/sale_amendment/tests/scenario_sale_amendment.rst
@@ -11,28 +11,21 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('sale_amendment')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale_amendment', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/sale_blanket_agreement/tests/scenario_sale_blanket_agreement.rst b/modules/sale_blanket_agreement/tests/scenario_sale_blanket_agreement.rst
index a2ce23c88d..bbe08c3158 100644
--- a/modules/sale_blanket_agreement/tests/scenario_sale_blanket_agreement.rst
+++ b/modules/sale_blanket_agreement/tests/scenario_sale_blanket_agreement.rst
@@ -9,7 +9,7 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -17,7 +17,8 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('sale_blanket_agreement')
+    >>> config = activate_modules(
+    ...     'sale_blanket_agreement', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -26,15 +27,9 @@ Activate modules::
     >>> SaleBlanketAgreement = Model.get('sale.blanket_agreement')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create customer::
 
diff --git a/modules/sale_complaint/tests/scenario_sale_complaint.rst b/modules/sale_complaint/tests/scenario_sale_complaint.rst
index 2455088f58..f9376258ff 100644
--- a/modules/sale_complaint/tests/scenario_sale_complaint.rst
+++ b/modules/sale_complaint/tests/scenario_sale_complaint.rst
@@ -11,28 +11,21 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_complaint')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale_complaint', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/sale_discount/tests/scenario_sale_discount.rst b/modules/sale_discount/tests/scenario_sale_discount.rst
index 6e3f247ab3..890eb4a9c5 100644
--- a/modules/sale_discount/tests/scenario_sale_discount.rst
+++ b/modules/sale_discount/tests/scenario_sale_discount.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_discount')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale_discount', create_company)
 
 Create parties::
 
diff --git a/modules/sale_extra/tests/scenario_sale_extra.rst b/modules/sale_extra/tests/scenario_sale_extra.rst
index 388a9e2a09..97a419aac6 100644
--- a/modules/sale_extra/tests/scenario_sale_extra.rst
+++ b/modules/sale_extra/tests/scenario_sale_extra.rst
@@ -10,22 +10,16 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
     >>> from trytond.modules.account_invoice.tests.tools import create_payment_term
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_extra')
+    >>> config = activate_modules('sale_extra', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/sale_gift_card/tests/scenario_sale_gift_card.rst b/modules/sale_gift_card/tests/scenario_sale_gift_card.rst
index d00731220b..09f98e163a 100644
--- a/modules/sale_gift_card/tests/scenario_sale_gift_card.rst
+++ b/modules/sale_gift_card/tests/scenario_sale_gift_card.rst
@@ -9,7 +9,7 @@ Imports::
 
     >>> from proteus import Model, Report
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.sale_gift_card import sale
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
@@ -20,7 +20,7 @@ Patch send_message_transactional::
 
 Activate modules::
 
-    >>> config = activate_modules('sale_gift_card')
+    >>> config = activate_modules('sale_gift_card', create_company, create_chart)
 
     >>> Account = Model.get('account.account')
     >>> AccountConfig = Model.get('account.configuration')
@@ -34,15 +34,9 @@ Activate modules::
     >>> Sequence = Model.get('ir.sequence')
     >>> SequenceType = Model.get('ir.sequence.type')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Setup gift card accounting::
 
diff --git a/modules/sale_gift_card/tests/scenario_sale_gift_card_goods.rst b/modules/sale_gift_card/tests/scenario_sale_gift_card_goods.rst
index 37399695b3..9851567135 100644
--- a/modules/sale_gift_card/tests/scenario_sale_gift_card_goods.rst
+++ b/modules/sale_gift_card/tests/scenario_sale_gift_card_goods.rst
@@ -8,12 +8,12 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('sale_gift_card')
+    >>> config = activate_modules('sale_gift_card', create_company, create_chart)
 
     >>> Account = Model.get('account.account')
     >>> AccountConfig = Model.get('account.configuration')
@@ -24,15 +24,9 @@ Activate modules::
     >>> ProductUoM = Model.get('product.uom')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Setup gift card accounting::
 
diff --git a/modules/sale_gift_card/tests/scenario_sale_point_gift_card.rst b/modules/sale_gift_card/tests/scenario_sale_point_gift_card.rst
index 3e0615a7b3..9d3af551d4 100644
--- a/modules/sale_gift_card/tests/scenario_sale_point_gift_card.rst
+++ b/modules/sale_gift_card/tests/scenario_sale_point_gift_card.rst
@@ -11,12 +11,13 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules(['sale_gift_card', 'sale_point'])
+    >>> config = activate_modules(
+    ...     ['sale_gift_card', 'sale_point'], create_company, create_chart)
 
     >>> Account = Model.get('account.account')
     >>> AccountConfig = Model.get('account.configuration')
@@ -34,21 +35,14 @@ Activate modules::
     >>> SequenceStrict = Model.get('ir.sequence.strict')
     >>> SequenceType = Model.get('ir.sequence.type')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Setup gift card accounting::
 
diff --git a/modules/sale_history/tests/scenario_sale_history.rst b/modules/sale_history/tests/scenario_sale_history.rst
index 352b2f36ae..e258792f5c 100644
--- a/modules/sale_history/tests/scenario_sale_history.rst
+++ b/modules/sale_history/tests/scenario_sale_history.rst
@@ -5,17 +5,12 @@ Sale History Scenario
 Imports::
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_history')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale_history', create_company)
 
 Create customer::
 
diff --git a/modules/sale_invoice_date/tests/scenario_sale_invoice_date.rst b/modules/sale_invoice_date/tests/scenario_sale_invoice_date.rst
index 842cda3291..75f7eedd04 100644
--- a/modules/sale_invoice_date/tests/scenario_sale_invoice_date.rst
+++ b/modules/sale_invoice_date/tests/scenario_sale_invoice_date.rst
@@ -14,7 +14,7 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -22,7 +22,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('sale_invoice_date')
+    >>> config = activate_modules('sale_invoice_date', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -31,21 +31,15 @@ Activate modules::
     >>> InvoiceTerm = Model.get('sale.invoice.term')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, (today, end_month)))
+    ...     create_fiscalyear(today=(today, end_month)))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create invoice term::
 
diff --git a/modules/sale_invoice_grouping/tests/scenario_sale_invoice_grouping.rst b/modules/sale_invoice_grouping/tests/scenario_sale_invoice_grouping.rst
index aeb580d78b..372c3f2e21 100644
--- a/modules/sale_invoice_grouping/tests/scenario_sale_invoice_grouping.rst
+++ b/modules/sale_invoice_grouping/tests/scenario_sale_invoice_grouping.rst
@@ -11,17 +11,13 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, set_user
 
 Activate modules::
 
-    >>> config = activate_modules('sale_invoice_grouping')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     'sale_invoice_grouping', create_company, create_chart)
 
 Create sale user::
 
@@ -45,14 +41,12 @@ Create account user::
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/sale_invoice_grouping/tests/scenario_sale_invoice_grouping_multiple.rst b/modules/sale_invoice_grouping/tests/scenario_sale_invoice_grouping_multiple.rst
index 37e7aa96c7..f41c8b03a2 100644
--- a/modules/sale_invoice_grouping/tests/scenario_sale_invoice_grouping_multiple.rst
+++ b/modules/sale_invoice_grouping/tests/scenario_sale_invoice_grouping_multiple.rst
@@ -11,12 +11,13 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_invoice_grouping')
+    >>> config = activate_modules(
+    ...     'sale_invoice_grouping', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -25,21 +26,14 @@ Activate modules::
     >>> Sale = Model.get('sale.sale')
     >>> Invoice = Model.get('account.invoice')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create parties::
 
diff --git a/modules/sale_opportunity/tests/scenario_sale_opportunity.rst b/modules/sale_opportunity/tests/scenario_sale_opportunity.rst
index f44db2ab01..ab63bc3ec8 100644
--- a/modules/sale_opportunity/tests/scenario_sale_opportunity.rst
+++ b/modules/sale_opportunity/tests/scenario_sale_opportunity.rst
@@ -10,24 +10,18 @@ Imports::
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_tax, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import create_payment_term
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, set_user
 
 Activate modules::
 
-    >>> config = activate_modules('sale_opportunity')
+    >>> config = activate_modules('sale_opportunity', create_company, create_chart)
 
     >>> Sale = Model.get('sale.sale')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create tax::
diff --git a/modules/sale_opportunity/tests/scenario_sale_opportunity_reporting.rst b/modules/sale_opportunity/tests/scenario_sale_opportunity_reporting.rst
index 7c725010b4..8500292f8e 100644
--- a/modules/sale_opportunity/tests/scenario_sale_opportunity_reporting.rst
+++ b/modules/sale_opportunity/tests/scenario_sale_opportunity_reporting.rst
@@ -8,25 +8,20 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('sale_opportunity')
+    >>> config = activate_modules('sale_opportunity', create_company)
 
     >>> Employee = Model.get('company.employee')
     >>> Opportunity = Model.get('sale.opportunity')
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create employees::
 
     >>> employee1_party = Party(name="Employee 1")
diff --git a/modules/sale_payment/tests/scenario_sale_payment.rst b/modules/sale_payment/tests/scenario_sale_payment.rst
index dc9dcd06dd..d11f0be35b 100644
--- a/modules/sale_payment/tests/scenario_sale_payment.rst
+++ b/modules/sale_payment/tests/scenario_sale_payment.rst
@@ -11,28 +11,23 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules(['sale_payment', 'account_payment_clearing'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     ['sale_payment', 'account_payment_clearing'],
+    ...     create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> payable = accounts['payable']
 
diff --git a/modules/sale_payment/tests/scenario_sale_payment_no_clearing.rst b/modules/sale_payment/tests/scenario_sale_payment_no_clearing.rst
index 886265eb8b..975037e84c 100644
--- a/modules/sale_payment/tests/scenario_sale_payment_no_clearing.rst
+++ b/modules/sale_payment/tests/scenario_sale_payment_no_clearing.rst
@@ -11,12 +11,12 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_payment')
+    >>> config = activate_modules('sale_payment', create_company, create_chart)
 
     >>> PaymentJournal = Model.get('account.payment.journal')
     >>> Party = Model.get('party.party')
@@ -24,21 +24,14 @@ Activate modules::
     >>> Sale = Model.get('sale.sale')
     >>> Payment = Model.get('account.payment')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> payable = accounts['payable']
 
diff --git a/modules/sale_point/tests/scenario_sale_point.rst b/modules/sale_point/tests/scenario_sale_point.rst
index a62af7fb1e..cf37b0f636 100644
--- a/modules/sale_point/tests/scenario_sale_point.rst
+++ b/modules/sale_point/tests/scenario_sale_point.rst
@@ -11,12 +11,12 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('sale_point')
+    >>> config = activate_modules('sale_point', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Location = Model.get('stock.location')
@@ -30,21 +30,14 @@ Activate modules::
     >>> SequenceType = Model.get('ir.sequence.type')
     >>> StockMove = Model.get('stock.move')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create tax::
 
diff --git a/modules/sale_point/tests/scenario_sale_point_reporting.rst b/modules/sale_point/tests/scenario_sale_point_reporting.rst
index fc46c2fce0..6b76f7d049 100644
--- a/modules/sale_point/tests/scenario_sale_point_reporting.rst
+++ b/modules/sale_point/tests/scenario_sale_point_reporting.rst
@@ -11,12 +11,12 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_point')
+    >>> config = activate_modules('sale_point', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Location = Model.get('stock.location')
@@ -30,21 +30,14 @@ Activate modules::
     >>> SequenceType = Model.get('ir.sequence.type')
     >>> StockMove = Model.get('stock.move')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create account categories::
 
diff --git a/modules/sale_point/tests/scenario_sale_point_return.rst b/modules/sale_point/tests/scenario_sale_point_return.rst
index bb1f10257c..e15b3b849e 100644
--- a/modules/sale_point/tests/scenario_sale_point_return.rst
+++ b/modules/sale_point/tests/scenario_sale_point_return.rst
@@ -11,12 +11,12 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('sale_point')
+    >>> config = activate_modules('sale_point', create_company, create_chart)
 
 Get models::
 
@@ -31,21 +31,14 @@ Get models::
     >>> SequenceStrict = Model.get('ir.sequence.strict')
     >>> SequenceType = Model.get('ir.sequence.type')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create tax::
 
diff --git a/modules/sale_point/tests/scenario_sale_point_session.rst b/modules/sale_point/tests/scenario_sale_point_session.rst
index be60a44007..5ed3e3caf3 100644
--- a/modules/sale_point/tests/scenario_sale_point_session.rst
+++ b/modules/sale_point/tests/scenario_sale_point_session.rst
@@ -11,12 +11,12 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_point')
+    >>> config = activate_modules('sale_point', create_company, create_chart)
 
     >>> Journal = Model.get('account.journal')
     >>> Location = Model.get('stock.location')
@@ -31,21 +31,14 @@ Activate modules::
     >>> Session = Model.get('sale.point.cash.session')
     >>> TransferType = Model.get('sale.point.cash.transfer.type')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create account categories::
 
diff --git a/modules/sale_point/tests/scenario_sale_point_tax_excluded.rst b/modules/sale_point/tests/scenario_sale_point_tax_excluded.rst
index 18c351f609..4a25f23eb7 100644
--- a/modules/sale_point/tests/scenario_sale_point_tax_excluded.rst
+++ b/modules/sale_point/tests/scenario_sale_point_tax_excluded.rst
@@ -11,12 +11,12 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_point')
+    >>> config = activate_modules('sale_point', create_company, create_chart)
 
 Get models::
 
@@ -31,21 +31,14 @@ Get models::
     >>> SequenceStrict = Model.get('ir.sequence.strict')
     >>> SequenceType = Model.get('ir.sequence.type')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create tax::
 
diff --git a/modules/sale_price_list/tests/scenario_sale_price_list.rst b/modules/sale_price_list/tests/scenario_sale_price_list.rst
index bbd8b5a6f5..a232443dea 100644
--- a/modules/sale_price_list/tests/scenario_sale_price_list.rst
+++ b/modules/sale_price_list/tests/scenario_sale_price_list.rst
@@ -11,17 +11,12 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, set_user
 
 Activate modules::
 
-    >>> config = activate_modules('sale_price_list')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale_price_list', create_company, create_chart)
 
 Create sale user::
 
@@ -46,14 +41,12 @@ Create sale user::
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/sale_product_customer/tests/scenario_sale_copy_product_customer.rst b/modules/sale_product_customer/tests/scenario_sale_copy_product_customer.rst
index 891f942d88..97bbb4d3e6 100644
--- a/modules/sale_product_customer/tests/scenario_sale_copy_product_customer.rst
+++ b/modules/sale_product_customer/tests/scenario_sale_copy_product_customer.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('sale_product_customer')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale_product_customer', create_company)
 
 Create party::
 
diff --git a/modules/sale_product_customer/tests/scenario_sale_product_customer.rst b/modules/sale_product_customer/tests/scenario_sale_product_customer.rst
index 5dc3ddfeae..1527408551 100644
--- a/modules/sale_product_customer/tests/scenario_sale_product_customer.rst
+++ b/modules/sale_product_customer/tests/scenario_sale_product_customer.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_product_customer')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale_product_customer', create_company)
 
 Create parties::
 
diff --git a/modules/sale_product_quantity/tests/scenario_sale_product_quantity.rst b/modules/sale_product_quantity/tests/scenario_sale_product_quantity.rst
index 1e13a74ec8..806f0ddb4a 100644
--- a/modules/sale_product_quantity/tests/scenario_sale_product_quantity.rst
+++ b/modules/sale_product_quantity/tests/scenario_sale_product_quantity.rst
@@ -7,23 +7,18 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_product_quantity')
+    >>> config = activate_modules('sale_product_quantity', create_company)
 
     >>> Party = Model.get('party.party')
     >>> ProductTemplate = Model.get('product.template')
     >>> ProductUom = Model.get('product.uom')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create parties::
 
     >>> customer = Party(name="Customer")
diff --git a/modules/sale_product_quantity/tests/scenario_sale_product_quantity_pos.rst b/modules/sale_product_quantity/tests/scenario_sale_product_quantity_pos.rst
index 08411b60fe..b0790b4e8f 100644
--- a/modules/sale_product_quantity/tests/scenario_sale_product_quantity_pos.rst
+++ b/modules/sale_product_quantity/tests/scenario_sale_product_quantity_pos.rst
@@ -7,13 +7,14 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['sale_product_quantity', 'sale_point'])
+    ...     ['sale_product_quantity', 'sale_point'],
+    ...     create_company)
 
     >>> Journal = Model.get('account.journal')
     >>> Location = Model.get('stock.location')
@@ -25,11 +26,6 @@ Activate modules::
     >>> SequenceStrict = Model.get('ir.sequence.strict')
     >>> SequenceType = Model.get('ir.sequence.type')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Get journal::
 
     >>> journal_revenue, = Journal.find([('type', '=', 'revenue')], limit=1)
diff --git a/modules/sale_product_recommendation_association_rule/tests/scenario_sale_product_recommendation_association_rule.rst b/modules/sale_product_recommendation_association_rule/tests/scenario_sale_product_recommendation_association_rule.rst
index 0b54d28f7f..51c32fca18 100644
--- a/modules/sale_product_recommendation_association_rule/tests/scenario_sale_product_recommendation_association_rule.rst
+++ b/modules/sale_product_recommendation_association_rule/tests/scenario_sale_product_recommendation_association_rule.rst
@@ -8,12 +8,14 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_product_recommendation_association_rule')
+    >>> config = activate_modules(
+    ...     'sale_product_recommendation_association_rule',
+    ...     create_company)
 
     >>> Cron = Model.get('ir.cron')
     >>> Party = Model.get('party.party')
@@ -23,11 +25,6 @@ Activate modules::
     >>> SaleConfiguration = Model.get('sale.configuration')
     >>> Uom = Model.get('product.uom')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Configuration association rule::
 
     >>> sale_config = SaleConfiguration(1)
diff --git a/modules/sale_promotion/tests/scenario_sale_promotion.rst b/modules/sale_promotion/tests/scenario_sale_promotion.rst
index f85e529c2f..79504fe806 100644
--- a/modules/sale_promotion/tests/scenario_sale_promotion.rst
+++ b/modules/sale_promotion/tests/scenario_sale_promotion.rst
@@ -10,22 +10,16 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
     >>> from trytond.modules.account_invoice.tests.tools import create_payment_term
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_promotion')
+    >>> config = activate_modules('sale_promotion', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create customer::
diff --git a/modules/sale_promotion/tests/scenario_sale_promotion_amount.rst b/modules/sale_promotion/tests/scenario_sale_promotion_amount.rst
index 5c2a7ef5a7..257f610e14 100644
--- a/modules/sale_promotion/tests/scenario_sale_promotion_amount.rst
+++ b/modules/sale_promotion/tests/scenario_sale_promotion_amount.rst
@@ -7,17 +7,13 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_promotion')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale_promotion', create_company)
 
 Create customer::
 
@@ -51,7 +47,7 @@ Create Promotion::
     >>> Promotion = Model.get('sale.promotion')
     >>> promotion = Promotion(name='product 2 free')
     >>> promotion.amount = Decimal('100')
-    >>> promotion.currency = company.currency
+    >>> promotion.currency = get_currency()
     >>> promotion.products.extend([product2])
     >>> promotion.formula = '0.0'
     >>> promotion.save()
diff --git a/modules/sale_promotion_coupon/tests/scenario_sale_promotion_coupon.rst b/modules/sale_promotion_coupon/tests/scenario_sale_promotion_coupon.rst
index 917533b433..c7c81a2a88 100644
--- a/modules/sale_promotion_coupon/tests/scenario_sale_promotion_coupon.rst
+++ b/modules/sale_promotion_coupon/tests/scenario_sale_promotion_coupon.rst
@@ -8,22 +8,17 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_promotion_coupon')
+    >>> config = activate_modules(
+    ...     'sale_promotion_coupon', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create customer::
diff --git a/modules/sale_secondary_unit/tests/scenario_sale_blanket_agreement_secondary_unit.rst b/modules/sale_secondary_unit/tests/scenario_sale_blanket_agreement_secondary_unit.rst
index a165e9e46d..7593b9fd4f 100644
--- a/modules/sale_secondary_unit/tests/scenario_sale_blanket_agreement_secondary_unit.rst
+++ b/modules/sale_secondary_unit/tests/scenario_sale_blanket_agreement_secondary_unit.rst
@@ -9,7 +9,7 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -17,8 +17,9 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules([
-    ...         'sale_secondary_unit', 'sale_blanket_agreement'])
+    >>> config = activate_modules(
+    ...     ['sale_secondary_unit', 'sale_blanket_agreement'],
+    ...     create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -26,15 +27,9 @@ Activate modules::
     >>> ProductTemplate = Model.get('product.template')
     >>> SaleBlanketAgreement = Model.get('sale.blanket_agreement')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create customer::
 
diff --git a/modules/sale_secondary_unit/tests/scenario_sale_secondary_unit.rst b/modules/sale_secondary_unit/tests/scenario_sale_secondary_unit.rst
index 2b79d4d7ec..b63379654a 100644
--- a/modules/sale_secondary_unit/tests/scenario_sale_secondary_unit.rst
+++ b/modules/sale_secondary_unit/tests/scenario_sale_secondary_unit.rst
@@ -8,7 +8,7 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
@@ -17,17 +17,12 @@ Activate modules::
     ...     'sale_amendment',
     ...     'sale_secondary_unit',
     ...     'account_invoice_secondary_unit',
-    ...     'stock_secondary_unit'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    ...     'stock_secondary_unit'],
+    ...     create_company, create_chart)
 
 Create chart of accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create customer::
 
diff --git a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst
index f1cefd5d3e..0259576007 100644
--- a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst
+++ b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost.rst
@@ -12,7 +12,7 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
@@ -21,23 +21,17 @@ Activate modules::
     ...         'sale_shipment_cost',
     ...         'sale',
     ...         'account_invoice',
-    ...         ])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    ...         ],
+    ...     create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
@@ -147,12 +141,12 @@ Send products::
     Decimal('2.0000')
     >>> shipment.cost_sale_used
     Decimal('3.0000')
-    >>> assertEqual(shipment.cost_sale_currency_used, company.currency)
+    >>> assertEqual(shipment.cost_sale_currency_used, shipment.company.currency)
     >>> move, = shipment.inventory_moves
     >>> move.quantity = 4
     >>> shipment.cost_sale_used
     Decimal('3.0000')
-    >>> assertEqual(shipment.cost_sale_currency_used, company.currency)
+    >>> assertEqual(shipment.cost_sale_currency_used, shipment.company.currency)
     >>> shipment.state
     'waiting'
     >>> shipment.click('assign_force')
diff --git a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_modify_price.rst b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_modify_price.rst
index 89c6fdd497..6743ab3858 100644
--- a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_modify_price.rst
+++ b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_modify_price.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('sale_shipment_cost')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale_shipment_cost', create_company)
 
 Create customer::
 
diff --git a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_promotion.rst b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_promotion.rst
index f329e6b677..8c50434ff0 100644
--- a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_promotion.rst
+++ b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_promotion.rst
@@ -8,7 +8,8 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
@@ -17,17 +18,12 @@ Activate modules::
     ...         'sale_shipment_cost',
     ...         'sale',
     ...         'sale_promotion',
-    ...         ])
+    ...         ],
+    ...     create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create customer::
 
@@ -76,7 +72,7 @@ Create Promotion::
     >>> promotion = Promotion(name='product 2 free')
     >>> promotion.amount = Decimal('101')
     >>> promotion.amount_shipment_cost_included = False
-    >>> promotion.currency = company.currency
+    >>> promotion.currency = get_currency()
     >>> promotion.products.extend([Product(carrier_product.id)])
     >>> promotion.formula = '0.0'
     >>> promotion.save()
diff --git a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_stock.rst b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_stock.rst
index 9133c685da..0e4ff1779b 100644
--- a/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_stock.rst
+++ b/modules/sale_shipment_cost/tests/scenario_sale_shipment_cost_stock.rst
@@ -8,7 +8,7 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
@@ -16,7 +16,8 @@ Activate modules::
     >>> config = activate_modules([
     ...         'sale_shipment_cost',
     ...         'sale',
-    ...         ])
+    ...         ],
+    ...     create_company, create_chart)
 
     >>> Carrier = Model.get('carrier')
     >>> CarrierSelection = Model.get('carrier.selection')
@@ -27,15 +28,9 @@ Activate modules::
     >>> Sale = Model.get('sale.sale')
     >>> ShipmentOut = Model.get('stock.shipment.out')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create customer::
 
diff --git a/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping.rst b/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping.rst
index b94adb1525..1933825dfd 100644
--- a/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping.rst
+++ b/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping.rst
@@ -11,17 +11,13 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, set_user
 
 Activate modules::
 
-    >>> config = activate_modules('sale_shipment_grouping')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     'sale_shipment_grouping', create_company, create_chart)
 
 Create sale user::
 
@@ -45,14 +41,12 @@ Create stock user::
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping_multiple.rst b/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping_multiple.rst
index 1bd366a526..c2d6fb4349 100644
--- a/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping_multiple.rst
+++ b/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping_multiple.rst
@@ -11,12 +11,13 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_shipment_grouping')
+    >>> config = activate_modules(
+    ...     'sale_shipment_grouping', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -25,21 +26,14 @@ Activate modules::
     >>> Sale = Model.get('sale.sale')
     >>> ShipmentOut = Model.get('stock.shipment.out')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create parties::
 
diff --git a/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping_return.rst b/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping_return.rst
index 97672e0b7b..53deb80098 100644
--- a/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping_return.rst
+++ b/modules/sale_shipment_grouping/tests/scenario_sale_shipment_grouping_return.rst
@@ -8,12 +8,13 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_shipment_grouping')
+    >>> config = activate_modules(
+    ...     'sale_shipment_grouping', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -21,15 +22,9 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create parties::
 
diff --git a/modules/sale_shipment_tolerance/tests/scenario_sale_over_shipment_tolerance.rst b/modules/sale_shipment_tolerance/tests/scenario_sale_over_shipment_tolerance.rst
index 05d62eba10..1681610188 100644
--- a/modules/sale_shipment_tolerance/tests/scenario_sale_over_shipment_tolerance.rst
+++ b/modules/sale_shipment_tolerance/tests/scenario_sale_over_shipment_tolerance.rst
@@ -8,22 +8,17 @@ Imports::
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_shipment_tolerance')
+    >>> config = activate_modules(
+    ...     'sale_shipment_tolerance', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create parties::
diff --git a/modules/sale_shipment_tolerance/tests/scenario_sale_under_shipment_tolerance.rst b/modules/sale_shipment_tolerance/tests/scenario_sale_under_shipment_tolerance.rst
index da557ae440..c17c7f6f5c 100644
--- a/modules/sale_shipment_tolerance/tests/scenario_sale_under_shipment_tolerance.rst
+++ b/modules/sale_shipment_tolerance/tests/scenario_sale_under_shipment_tolerance.rst
@@ -8,22 +8,17 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_shipment_tolerance')
+    >>> config = activate_modules(
+    ...     'sale_shipment_tolerance', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create parties::
diff --git a/modules/sale_stock_quantity/tests/scenario_sale_stock_quantity.rst b/modules/sale_stock_quantity/tests/scenario_sale_stock_quantity.rst
index 45f039607d..1e89d21f8f 100644
--- a/modules/sale_stock_quantity/tests/scenario_sale_stock_quantity.rst
+++ b/modules/sale_stock_quantity/tests/scenario_sale_stock_quantity.rst
@@ -12,7 +12,7 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.stock.exceptions import InventoryFutureWarning
     >>> from trytond.tests.tools import activate_modules
 
@@ -21,23 +21,19 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules(['sale_stock_quantity', 'stock_supply'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     ['sale_stock_quantity', 'stock_supply'],
+    ...     create_company, create_chart)
 
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, (today, later)))
+    ...     create_fiscalyear(today=(today, later)))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/sale_subscription/tests/scenario_sale_subscription.rst b/modules/sale_subscription/tests/scenario_sale_subscription.rst
index 871cc31dc0..26a2d8320f 100644
--- a/modules/sale_subscription/tests/scenario_sale_subscription.rst
+++ b/modules/sale_subscription/tests/scenario_sale_subscription.rst
@@ -9,17 +9,12 @@ Imports::
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('sale_subscription')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale_subscription', create_company, create_chart)
 
 Create sale user::
 
@@ -42,10 +37,9 @@ Create product user::
     >>> product_user.groups.append(product_group)
     >>> product_user.save()
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create party::
diff --git a/modules/sale_subscription/tests/scenario_sale_subscription_advanced_invoice.rst b/modules/sale_subscription/tests/scenario_sale_subscription_advanced_invoice.rst
index 8eab7e16dd..facbe78187 100644
--- a/modules/sale_subscription/tests/scenario_sale_subscription_advanced_invoice.rst
+++ b/modules/sale_subscription/tests/scenario_sale_subscription_advanced_invoice.rst
@@ -9,22 +9,16 @@ Imports::
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_subscription')
+    >>> config = activate_modules('sale_subscription', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create party::
diff --git a/modules/sale_subscription/tests/scenario_sale_subscription_new_line.rst b/modules/sale_subscription/tests/scenario_sale_subscription_new_line.rst
index 034b83cc79..a18ff85e48 100644
--- a/modules/sale_subscription/tests/scenario_sale_subscription_new_line.rst
+++ b/modules/sale_subscription/tests/scenario_sale_subscription_new_line.rst
@@ -9,22 +9,16 @@ Imports::
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_subscription')
+    >>> config = activate_modules('sale_subscription', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create party::
diff --git a/modules/sale_subscription_asset/tests/scenario_sale_subscription_asset.rst b/modules/sale_subscription_asset/tests/scenario_sale_subscription_asset.rst
index 818c2ab0bf..9d35289d9d 100644
--- a/modules/sale_subscription_asset/tests/scenario_sale_subscription_asset.rst
+++ b/modules/sale_subscription_asset/tests/scenario_sale_subscription_asset.rst
@@ -9,22 +9,17 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('sale_subscription_asset')
+    >>> config = activate_modules(
+    ...     'sale_subscription_asset', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
 
 Create party::
diff --git a/modules/sale_supply/tests/scenario_sale_supply.rst b/modules/sale_supply/tests/scenario_sale_supply.rst
index 9df21e69ce..10cd419138 100644
--- a/modules/sale_supply/tests/scenario_sale_supply.rst
+++ b/modules/sale_supply/tests/scenario_sale_supply.rst
@@ -11,17 +11,14 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, set_user
 
 Activate modules::
 
-    >>> config = activate_modules(['sale_supply', 'sale', 'purchase'])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     ['sale_supply', 'sale', 'purchase'],
+    ...     create_company, create_chart)
 
 Create sale user::
 
@@ -58,14 +55,12 @@ Create stock user::
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/sale_supply/tests/scenario_sale_supply_notifications.rst b/modules/sale_supply/tests/scenario_sale_supply_notifications.rst
index c8a6d52d97..4adcca82b6 100644
--- a/modules/sale_supply/tests/scenario_sale_supply_notifications.rst
+++ b/modules/sale_supply/tests/scenario_sale_supply_notifications.rst
@@ -10,17 +10,13 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules(['sale_supply', 'stock_supply'])
+    >>> config = activate_modules(['sale_supply', 'stock_supply'], create_company)
 
     >>> Location = Model.get('stock.location')
     >>> OrderPoint = Model.get('stock.order_point')
     >>> ProductTemplate = Model.get('product.template')
     >>> UoM = Model.get('product.uom')
 
-Create company::
-
-    >>> _ = create_company()
-
 Get locations::
 
     >>> warehouse_location, = Location.find([('type', '=', 'warehouse')])
diff --git a/modules/sale_supply/tests/scenario_sale_supply_request_cancelled.rst b/modules/sale_supply/tests/scenario_sale_supply_request_cancelled.rst
index 726be927aa..e3e6166006 100644
--- a/modules/sale_supply/tests/scenario_sale_supply_request_cancelled.rst
+++ b/modules/sale_supply/tests/scenario_sale_supply_request_cancelled.rst
@@ -13,7 +13,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('sale_supply')
+    >>> config = activate_modules('sale_supply', create_company, create_chart)
 
     >>> Party = Model.get('party.party')
     >>> ProductCategory = Model.get('product.category')
@@ -23,13 +23,8 @@ Activate modules::
     >>> Sale = Model.get('sale.sale')
     >>> UoM = Model.get('product.uom')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create parties::
diff --git a/modules/sale_supply/tests/scenario_sale_supply_shipment_on_invoice.rst b/modules/sale_supply/tests/scenario_sale_supply_shipment_on_invoice.rst
index e512406866..41a9a61656 100644
--- a/modules/sale_supply/tests/scenario_sale_supply_shipment_on_invoice.rst
+++ b/modules/sale_supply/tests/scenario_sale_supply_shipment_on_invoice.rst
@@ -11,28 +11,21 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_supply')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('sale_supply', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
     >>> Journal = Model.get('account.journal')
     >>> PaymentMethod = Model.get('account.invoice.payment.method')
diff --git a/modules/sale_supply/tests/scenario_sale_supply_stock_first.rst b/modules/sale_supply/tests/scenario_sale_supply_stock_first.rst
index d2a73133d5..f6dcd3c9fd 100644
--- a/modules/sale_supply/tests/scenario_sale_supply_stock_first.rst
+++ b/modules/sale_supply/tests/scenario_sale_supply_stock_first.rst
@@ -13,7 +13,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('sale_supply')
+    >>> config = activate_modules('sale_supply', create_company, create_chart)
 
     >>> Inventory = Model.get('stock.inventory')
     >>> Location = Model.get('stock.location')
@@ -23,13 +23,8 @@ Activate modules::
     >>> Sale = Model.get('sale.sale')
     >>> UoM = Model.get('product.uom')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create parties::
diff --git a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst
index 080fc2e9af..cfbdf71766 100644
--- a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst
+++ b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment.rst
@@ -12,7 +12,7 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, set_user
 
     >>> today = dt.date.today()
@@ -23,12 +23,8 @@ Activate modules::
     ...         'sale_supply_drop_shipment',
     ...         'sale',
     ...         'purchase',
-    ...         ])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    ...         ],
+    ...     create_company, create_chart)
 
 Create sale user::
 
@@ -82,13 +78,12 @@ Create account user::
 Create fiscal year::
 
     >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company, today))
+    ...     create_fiscalyear(today=today))
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_on_invoice.rst b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_on_invoice.rst
index 99c248d404..a78abf710c 100644
--- a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_on_invoice.rst
+++ b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_on_invoice.rst
@@ -12,28 +12,22 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('sale_supply_drop_shipment')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(
+    ...     'sale_supply_drop_shipment', create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
     >>> Journal = Model.get('account.journal')
     >>> PaymentMethod = Model.get('account.invoice.payment.method')
diff --git a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_remaining_qty.rst b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_remaining_qty.rst
index 343d2b640c..ed6465d076 100644
--- a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_remaining_qty.rst
+++ b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_remaining_qty.rst
@@ -12,7 +12,7 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     create_payment_term, set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
@@ -21,23 +21,17 @@ Activate modules::
     ...         'sale_supply_drop_shipment',
     ...         'sale',
     ...         'purchase',
-    ...         ])
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    ...         ],
+    ...     create_company, create_chart)
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_split.rst b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_split.rst
index bd8b83b8b8..4a31bd6f5a 100644
--- a/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_split.rst
+++ b/modules/sale_supply_drop_shipment/tests/scenario_sale_supply_drop_shipment_split.rst
@@ -16,7 +16,8 @@ Activate modules::
     >>> config = activate_modules([
     ...         'sale_supply_drop_shipment',
     ...         'stock_split',
-    ...         ])
+    ...         ],
+    ...     create_company, create_chart)
 
     >>> Move = Model.get('stock.move')
     >>> Party = Model.get('party.party')
@@ -29,13 +30,8 @@ Activate modules::
     >>> Sale = Model.get('sale.sale')
     >>> Shipment = Model.get('stock.shipment.drop')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of account::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create parties::
diff --git a/modules/sale_supply_production/tests/scenario_sale_supply_production.rst b/modules/sale_supply_production/tests/scenario_sale_supply_production.rst
index 0cf30655df..265e432934 100644
--- a/modules/sale_supply_production/tests/scenario_sale_supply_production.rst
+++ b/modules/sale_supply_production/tests/scenario_sale_supply_production.rst
@@ -8,22 +8,17 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('sale_supply_production')
+    >>> config = activate_modules(
+    ...     'sale_supply_production', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create parties::
 
diff --git a/modules/sale_supply_production/tests/scenario_sale_supply_production_routing.rst b/modules/sale_supply_production/tests/scenario_sale_supply_production_routing.rst
index ca908644e2..2705648720 100644
--- a/modules/sale_supply_production/tests/scenario_sale_supply_production_routing.rst
+++ b/modules/sale_supply_production/tests/scenario_sale_supply_production_routing.rst
@@ -12,7 +12,9 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules(['sale_supply_production', 'production_routing'])
+    >>> config = activate_modules(
+    ...     ['sale_supply_production', 'production_routing'],
+    ...     create_company)
 
     >>> BoM = Model.get('production.bom')
     >>> Party = Model.get('party.party')
@@ -22,10 +24,6 @@ Activate modules::
     >>> Routing = Model.get('production.routing')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
-
-    >>> _ = create_company()
-
 Create parties::
 
     >>> Party = Model.get('party.party')
diff --git a/modules/sale_supply_production/tests/scenario_sale_supply_production_stock_first.rst b/modules/sale_supply_production/tests/scenario_sale_supply_production_stock_first.rst
index caacf9b97b..b256d55312 100644
--- a/modules/sale_supply_production/tests/scenario_sale_supply_production_stock_first.rst
+++ b/modules/sale_supply_production/tests/scenario_sale_supply_production_stock_first.rst
@@ -13,7 +13,8 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('sale_supply_production')
+    >>> config = activate_modules(
+    ...     'sale_supply_production', create_company, create_chart)
 
     >>> Inventory = Model.get('stock.inventory')
     >>> Location = Model.get('stock.location')
@@ -23,13 +24,8 @@ Activate modules::
     >>> Sale = Model.get('sale.sale')
     >>> UoM = Model.get('product.uom')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart()
     >>> accounts = get_accounts()
 
 Create parties::
diff --git a/modules/stock/tests/scenario_stock_average_cost_price.rst b/modules/stock/tests/scenario_stock_average_cost_price.rst
index 791415567e..044eebd1da 100644
--- a/modules/stock/tests/scenario_stock_average_cost_price.rst
+++ b/modules/stock/tests/scenario_stock_average_cost_price.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Wizard
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
@@ -16,12 +17,11 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
+    >>> config = activate_modules('stock', create_company)
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create product::
 
@@ -73,9 +73,8 @@ Make 1 unit of the product available @ 100 ::
     >>> incoming_move.to_location = storage_sub_loc
     >>> incoming_move.planned_date = today
     >>> incoming_move.effective_date = today
-    >>> incoming_move.company = company
     >>> incoming_move.unit_price = Decimal('100')
-    >>> incoming_move.currency = company.currency
+    >>> incoming_move.currency = currency
     >>> incoming_move.click('do')
 
 Check Cost Price is 100::
@@ -94,9 +93,8 @@ Add 1 more unit @ 200::
     >>> incoming_move.to_location = storage_loc
     >>> incoming_move.planned_date = today
     >>> incoming_move.effective_date = today
-    >>> incoming_move.company = company
     >>> incoming_move.unit_price = Decimal('200')
-    >>> incoming_move.currency = company.currency
+    >>> incoming_move.currency = currency
     >>> incoming_move.click('do')
 
 Check Cost Price Average is 150::
@@ -116,9 +114,8 @@ Add twice 1 more unit @ 200::
     >>> incoming_move.to_location = storage_loc
     >>> incoming_move.planned_date = today
     >>> incoming_move.effective_date = today
-    >>> incoming_move.company = company
     >>> incoming_move.unit_price = Decimal('200')
-    >>> incoming_move.currency = company.currency
+    >>> incoming_move.currency = currency
     >>> incoming_move.save()
     >>> incoming_moves.append(incoming_move)
 
@@ -130,9 +127,8 @@ Add twice 1 more unit @ 200::
     >>> incoming_move.to_location = storage_loc
     >>> incoming_move.planned_date = today
     >>> incoming_move.effective_date = today
-    >>> incoming_move.company = company
     >>> incoming_move.unit_price = Decimal('200')
-    >>> incoming_move.currency = company.currency
+    >>> incoming_move.currency = currency
     >>> incoming_move.save()
     >>> incoming_moves.append(incoming_move)
 
@@ -175,8 +171,7 @@ Send one product we don't have in stock::
     >>> outgoing_move.to_location = customer_loc
     >>> outgoing_move.planned_date = today
     >>> outgoing_move.effective_date = today
-    >>> outgoing_move.company = company
-    >>> outgoing_move.currency = company.currency
+    >>> outgoing_move.currency = currency
     >>> outgoing_move.click('do')
 
 Cost price should stay 5::
@@ -191,12 +186,11 @@ Return one product to the supplier::
     >>> outgoing_move.unit = unit
     >>> outgoing_move.quantity = 1
     >>> outgoing_move.unit_price = Decimal('28')
-    >>> outgoing_move.currency = company.currency
+    >>> outgoing_move.currency = currency
     >>> outgoing_move.from_location = storage_loc
     >>> outgoing_move.to_location = supplier_loc
     >>> outgoing_move.planned_date = today
     >>> outgoing_move.effective_date = today
-    >>> outgoing_move.company = company
     >>> outgoing_move.click('do')
 
 Cost price should stay 5::
@@ -214,9 +208,8 @@ Receive one unit of the product with negative stock so the stock stays negative:
     >>> incoming_move.to_location = storage_loc
     >>> incoming_move.planned_date = today
     >>> incoming_move.effective_date = today
-    >>> incoming_move.company = company
     >>> incoming_move.unit_price = Decimal('3')
-    >>> incoming_move.currency = company.currency
+    >>> incoming_move.currency = currency
     >>> incoming_move.click('do')
 
 Cost price should be set to last unit price::
@@ -235,9 +228,8 @@ Receive two units of the product so the stock becomes positive::
     >>> incoming_move.to_location = storage_loc
     >>> incoming_move.planned_date = today
     >>> incoming_move.effective_date = today
-    >>> incoming_move.company = company
     >>> incoming_move.unit_price = Decimal('2')
-    >>> incoming_move.currency = company.currency
+    >>> incoming_move.currency = currency
     >>> incoming_move.click('do')
 
 Cost price should be set to last unit price::
diff --git a/modules/stock/tests/scenario_stock_inventory.rst b/modules/stock/tests/scenario_stock_inventory.rst
index 59d2262f5c..e584d34299 100644
--- a/modules/stock/tests/scenario_stock_inventory.rst
+++ b/modules/stock/tests/scenario_stock_inventory.rst
@@ -8,19 +8,19 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
+    >>> config = activate_modules('stock', create_company)
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Get stock locations::
 
@@ -82,9 +82,8 @@ Fill storage::
     >>> incoming_move.to_location = storage_loc
     >>> incoming_move.planned_date = today
     >>> incoming_move.effective_date = today
-    >>> incoming_move.company = company
     >>> incoming_move.unit_price = Decimal('100')
-    >>> incoming_move.currency = company.currency
+    >>> incoming_move.currency = currency
     >>> incoming_moves = [incoming_move]
 
     >>> incoming_move = StockMove()
@@ -95,9 +94,8 @@ Fill storage::
     >>> incoming_move.to_location = storage_loc
     >>> incoming_move.planned_date = today
     >>> incoming_move.effective_date = today
-    >>> incoming_move.company = company
     >>> incoming_move.unit_price = Decimal('70')
-    >>> incoming_move.currency = company.currency
+    >>> incoming_move.currency = currency
     >>> incoming_moves.append(incoming_move)
     >>> StockMove.click(incoming_moves, 'do')
 
@@ -129,9 +127,8 @@ Fill storage with more quantities::
     >>> incoming_move.to_location = storage_loc
     >>> incoming_move.planned_date = today
     >>> incoming_move.effective_date = today
-    >>> incoming_move.company = company
     >>> incoming_move.unit_price = Decimal('100')
-    >>> incoming_move.currency = company.currency
+    >>> incoming_move.currency = currency
     >>> incoming_moves = [incoming_move]
 
     >>> incoming_move = StockMove()
@@ -142,9 +139,8 @@ Fill storage with more quantities::
     >>> incoming_move.to_location = storage_loc
     >>> incoming_move.planned_date = today
     >>> incoming_move.effective_date = today
-    >>> incoming_move.company = company
     >>> incoming_move.unit_price = Decimal('70')
-    >>> incoming_move.currency = company.currency
+    >>> incoming_move.currency = currency
     >>> incoming_moves.append(incoming_move)
     >>> StockMove.click(incoming_moves, 'do')
 
diff --git a/modules/stock/tests/scenario_stock_inventory_count.rst b/modules/stock/tests/scenario_stock_inventory_count.rst
index fd19e757bf..38ff7c0c09 100644
--- a/modules/stock/tests/scenario_stock_inventory_count.rst
+++ b/modules/stock/tests/scenario_stock_inventory_count.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock', create_company)
 
 Get stock locations::
 
diff --git a/modules/stock/tests/scenario_stock_inventory_empty_quantity.rst b/modules/stock/tests/scenario_stock_inventory_empty_quantity.rst
index 8f4ca5f198..c6808441eb 100644
--- a/modules/stock/tests/scenario_stock_inventory_empty_quantity.rst
+++ b/modules/stock/tests/scenario_stock_inventory_empty_quantity.rst
@@ -8,19 +8,15 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock', create_company)
 
 Get stock locations::
 
@@ -58,9 +54,8 @@ Fill storage::
     >>> incoming_move.to_location = storage_loc
     >>> incoming_move.planned_date = today
     >>> incoming_move.effective_date = today
-    >>> incoming_move.company = company
     >>> incoming_move.unit_price = Decimal('100')
-    >>> incoming_move.currency = company.currency
+    >>> incoming_move.currency = get_currency()
     >>> incoming_move.click('do')
 
 Creating an inventory with empty quantities creates and empty move::
diff --git a/modules/stock/tests/scenario_stock_move_in_future.rst b/modules/stock/tests/scenario_stock_move_in_future.rst
index e0107c3409..29bea0acbc 100644
--- a/modules/stock/tests/scenario_stock_move_in_future.rst
+++ b/modules/stock/tests/scenario_stock_move_in_future.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
@@ -16,12 +17,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock', create_company)
 
 Create product::
 
@@ -53,7 +49,7 @@ A warning is raised when doing a move in the future::
     >>> move.quantity = 1
     >>> move.from_location = supplier_loc
     >>> move.to_location = storage_loc
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> move.effective_date = tomorrow
     >>> move.quantity = 2
     >>> move.unit_price = Decimal('1')
diff --git a/modules/stock/tests/scenario_stock_product_quantities_by_warehouse.rst b/modules/stock/tests/scenario_stock_product_quantities_by_warehouse.rst
index 5bbaa25530..4ec8cf01b9 100644
--- a/modules/stock/tests/scenario_stock_product_quantities_by_warehouse.rst
+++ b/modules/stock/tests/scenario_stock_product_quantities_by_warehouse.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -17,12 +18,11 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
+    >>> config = activate_modules('stock', create_company)
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create product::
 
@@ -56,7 +56,7 @@ Fill warehouse::
    >>> move.quantity = 10
    >>> move.effective_date = yesterday
    >>> move.unit_price = Decimal('10')
-   >>> move.currency = company.currency
+   >>> move.currency = currency
    >>> move.click('do')
 
 Forecast some moves::
@@ -69,7 +69,7 @@ Forecast some moves::
    >>> move.quantity = 6
    >>> move.planned_date = tomorrow
    >>> move.unit_price = Decimal('20')
-   >>> move.currency = company.currency
+   >>> move.currency = currency
    >>> move.save()
 
    >>> move = Move()
@@ -80,7 +80,7 @@ Forecast some moves::
    >>> move.quantity = 5
    >>> move.planned_date = tomorrow
    >>> move.unit_price = Decimal('10')
-   >>> move.currency = company.currency
+   >>> move.currency = currency
    >>> move.save()
 
    >>> move = Move()
@@ -91,7 +91,7 @@ Forecast some moves::
    >>> move.quantity = 3
    >>> move.planned_date = tomorrow
    >>> move.unit_price = Decimal('20')
-   >>> move.currency = company.currency
+   >>> move.currency = currency
    >>> move.save()
 
 
diff --git a/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst b/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst
index df13057617..0f111de169 100644
--- a/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst
+++ b/modules/stock/tests/scenario_stock_recompute_average_cost_price.rst
@@ -15,11 +15,10 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
+    >>> config = activate_modules('stock', create_company)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create product::
diff --git a/modules/stock/tests/scenario_stock_recompute_average_cost_price_production.rst b/modules/stock/tests/scenario_stock_recompute_average_cost_price_production.rst
index 00aabad278..601a81a97b 100644
--- a/modules/stock/tests/scenario_stock_recompute_average_cost_price_production.rst
+++ b/modules/stock/tests/scenario_stock_recompute_average_cost_price_production.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Wizard
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
@@ -16,17 +17,16 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
+    >>> config = activate_modules('stock', create_company)
 
     >>> Location = Model.get('stock.location')
     >>> ProductTemplate = Model.get('product.template')
     >>> ProductUom = Model.get('product.uom')
     >>> StockMove = Model.get('stock.move')
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create product::
 
@@ -64,7 +64,7 @@ Consume product for production and reverse some::
     ...     from_location=production_loc,
     ...     to_location=storage_loc,
     ...     unit_price=Decimal('40.0000'),
-    ...     currency=company.currency,
+    ...     currency=currency,
     ...     effective_date=today).click('do')
 
     >>> [m.cost_price for m in StockMove.find([])]
@@ -90,7 +90,7 @@ Receive product yesterday at new cost::
     ...     from_location=supplier_loc,
     ...     to_location=storage_loc,
     ...     unit_price=Decimal('20.0000'),
-    ...     currency=company.currency,
+    ...     currency=currency,
     ...     effective_date=yesterday).click('do')
 
 Recompute cost price::
diff --git a/modules/stock/tests/scenario_stock_reporting.rst b/modules/stock/tests/scenario_stock_reporting.rst
index 487031d30d..03a4592930 100644
--- a/modules/stock/tests/scenario_stock_reporting.rst
+++ b/modules/stock/tests/scenario_stock_reporting.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Report
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
@@ -16,12 +17,11 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
+    >>> config = activate_modules('stock', create_company)
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create customer & supplier::
 
@@ -63,7 +63,6 @@ Create Shipment In::
     >>> shipment_in.planned_date = today
     >>> shipment_in.supplier = supplier
     >>> shipment_in.warehouse = warehouse_loc
-    >>> shipment_in.company = company
 
 Receive a bunch of products::
 
@@ -73,9 +72,8 @@ Receive a bunch of products::
     >>> move.quantity = 100
     >>> move.from_location = supplier_loc
     >>> move.to_location = input_loc
-    >>> move.company = company
     >>> move.unit_price = Decimal('1')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment_in.save()
     >>> shipment_in.click('receive')
     >>> shipment_in.click('do')
@@ -96,7 +94,6 @@ Create Shipment Out::
     >>> shipment_out.planned_date = today
     >>> shipment_out.customer = customer
     >>> shipment_out.warehouse = warehouse_loc
-    >>> shipment_out.company = company
 
 Add two shipment lines of same product and go through the workflow::
 
@@ -106,9 +103,8 @@ Add two shipment lines of same product and go through the workflow::
     >>> move.quantity = 1
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
-    >>> move.company = company
     >>> move.unit_price = Decimal('1')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment_out.save()
     >>> shipment_out.click('wait')
     >>> shipment_out.click('assign_try')
@@ -137,7 +133,6 @@ Create an internal shipment::
     >>> ShipmentInternal = Model.get('stock.shipment.internal')
     >>> shipment_internal = ShipmentInternal()
     >>> shipment_internal.planned_date = today
-    >>> shipment_internal.company = company
     >>> shipment_internal.from_location = storage_loc
     >>> shipment_internal.to_location = lost_loc
     >>> move = shipment_internal.moves.new()
@@ -146,7 +141,6 @@ Create an internal shipment::
     >>> move.quantity = 1
     >>> move.from_location = storage_loc
     >>> move.to_location = lost_loc
-    >>> move.company = company
     >>> shipment_internal.save()
     >>> shipment_internal.click('wait')
     >>> shipment_internal.click('assign_try')
diff --git a/modules/stock/tests/scenario_stock_reporting_margin.rst b/modules/stock/tests/scenario_stock_reporting_margin.rst
index abaa0c5cbc..0d38387326 100644
--- a/modules/stock/tests/scenario_stock_reporting_margin.rst
+++ b/modules/stock/tests/scenario_stock_reporting_margin.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -16,12 +17,11 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
+    >>> config = activate_modules('stock', create_company)
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create product::
 
@@ -71,7 +71,7 @@ Create some moves::
     >>> move.to_location = storage_loc
     >>> move.quantity = 8
     >>> move.unit_price = Decimal('20')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> move.effective_date = yesterday
     >>> move.click('do')
 
@@ -81,7 +81,7 @@ Create some moves::
     >>> move.to_location = customer_loc
     >>> move.quantity = 2
     >>> move.unit_price = Decimal('40')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> move.effective_date = yesterday
     >>> move.click('do')
 
@@ -91,7 +91,7 @@ Create some moves::
     >>> move.to_location = customer_loc
     >>> move.quantity = 4
     >>> move.unit_price = Decimal('30')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> move.effective_date = today
     >>> move.click('do')
 
@@ -101,7 +101,7 @@ Create some moves::
     >>> move.to_location = storage_loc
     >>> move.quantity = 1
     >>> move.unit_price = Decimal('30')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> move.effective_date = today
     >>> move.click('do')
 
@@ -111,7 +111,7 @@ Create some moves::
     >>> move.to_location = customer_loc
     >>> move.quantity = 2
     >>> move.unit_price = Decimal('50')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> move.effective_date = today
     >>> move.click('do')
 
diff --git a/modules/stock/tests/scenario_stock_shipment_cron_assign.rst b/modules/stock/tests/scenario_stock_shipment_cron_assign.rst
index 254f4d0daa..01b3968abf 100644
--- a/modules/stock/tests/scenario_stock_shipment_cron_assign.rst
+++ b/modules/stock/tests/scenario_stock_shipment_cron_assign.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
@@ -16,7 +17,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
+    >>> config = activate_modules('stock', create_company)
 
     >>> Cron = Model.get('ir.cron')
     >>> Location = Model.get('stock.location')
@@ -27,10 +28,9 @@ Activate modules::
     >>> ShipmentOut = Model.get('stock.shipment.out')
     >>> UoM = Model.get('product.uom')
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create a product::
 
@@ -62,7 +62,7 @@ Fill storage::
     >>> move.from_location = supplier_loc
     >>> move.to_location = storage_loc
     >>> move.unit_price = Decimal('10.0000')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> move.effective_date = yesterday
     >>> move.click('do')
     >>> move.state
@@ -92,7 +92,7 @@ Create different shipments with different planned dates::
     >>> move.product = product
     >>> move.quantity = 2
     >>> move.unit_price = Decimal('10.0000')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment_out_1.click('wait')
     >>> shipment_out_1.state
     'waiting'
diff --git a/modules/stock/tests/scenario_stock_shipment_in.rst b/modules/stock/tests/scenario_stock_shipment_in.rst
index 8a71f15863..e9db293b30 100644
--- a/modules/stock/tests/scenario_stock_shipment_in.rst
+++ b/modules/stock/tests/scenario_stock_shipment_in.rst
@@ -7,12 +7,13 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Report
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertNotEqual
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
+    >>> config = activate_modules('stock', create_company)
 
     >>> Location = Model.get('stock.location')
     >>> Party = Model.get('party.party')
@@ -20,11 +21,6 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> ShipmentIn = Model.get('stock.shipment.in')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create supplier::
 
     >>> supplier = Party(name='Supplier')
@@ -57,7 +53,7 @@ Create a shipment::
     >>> move.from_location = supplier_loc
     >>> move.to_location = input_loc
     >>> move.unit_price = Decimal('5')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> shipment.save()
     >>> assertNotEqual(shipment.number, None)
 
diff --git a/modules/stock/tests/scenario_stock_shipment_in_return.rst b/modules/stock/tests/scenario_stock_shipment_in_return.rst
index 0eeda98745..9e2ccb9d76 100644
--- a/modules/stock/tests/scenario_stock_shipment_in_return.rst
+++ b/modules/stock/tests/scenario_stock_shipment_in_return.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual, assertNotEqual
 
     >>> today = dt.date.today()
@@ -16,12 +17,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock', create_company)
 
 Create supplier::
 
@@ -62,9 +58,8 @@ Create Shipment In::
     >>> move.quantity = 1
     >>> move.from_location = storage_loc
     >>> move.to_location = supplier_loc
-    >>> move.company = company
     >>> move.unit_price = Decimal('1')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> shipment_return.save()
     >>> shipment_return.number
     >>> shipment_return.click('wait')
diff --git a/modules/stock/tests/scenario_stock_shipment_in_same_storage_input.rst b/modules/stock/tests/scenario_stock_shipment_in_same_storage_input.rst
index 6729b3c873..06f7de734f 100644
--- a/modules/stock/tests/scenario_stock_shipment_in_same_storage_input.rst
+++ b/modules/stock/tests/scenario_stock_shipment_in_same_storage_input.rst
@@ -7,17 +7,13 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock', create_company)
 
 Create supplier::
 
@@ -58,13 +54,12 @@ Create Shipment In::
     >>> shipment_in = ShipmentIn()
     >>> shipment_in.supplier = supplier
     >>> shipment_in.warehouse = warehouse_loc
-    >>> shipment_in.company = company
     >>> move = shipment_in.incoming_moves.new()
     >>> move.product = product
     >>> move.unit = unit
     >>> move.quantity = 1
     >>> move.unit_price = Decimal('5')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> move.from_location = supplier_loc
     >>> move.to_location = storage1
     >>> shipment_in.save()
diff --git a/modules/stock/tests/scenario_stock_shipment_internal.rst b/modules/stock/tests/scenario_stock_shipment_internal.rst
index 46bed6ce10..52f3d7f8ee 100644
--- a/modules/stock/tests/scenario_stock_shipment_internal.rst
+++ b/modules/stock/tests/scenario_stock_shipment_internal.rst
@@ -8,7 +8,7 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Report
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import (
     ...     activate_modules, assertEqual, assertNotEqual, set_user)
 
@@ -18,12 +18,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock', create_company)
 
 Create product::
 
@@ -103,7 +98,6 @@ Create Internal Shipment from lost_found location::
 
     >>> lost_found_shipment = Shipment()
     >>> lost_found_shipment.planned_date = today
-    >>> lost_found_shipment.company = company
     >>> lost_found_shipment.from_location = lost_found_loc
     >>> lost_found_shipment.to_location = internal_loc
     >>> move = StockMove()
diff --git a/modules/stock/tests/scenario_stock_shipment_internal_transit.rst b/modules/stock/tests/scenario_stock_shipment_internal_transit.rst
index 91ddd55733..9b78d3c98a 100644
--- a/modules/stock/tests/scenario_stock_shipment_internal_transit.rst
+++ b/modules/stock/tests/scenario_stock_shipment_internal_transit.rst
@@ -8,7 +8,7 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -17,17 +17,12 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
+    >>> config = activate_modules('stock', create_company)
 
     >>> ProductTemplate = Model.get('product.template')
     >>> ProductUom = Model.get('product.uom')
     >>> Shipment = Model.get('stock.shipment.internal')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create product::
 
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
diff --git a/modules/stock/tests/scenario_stock_shipment_out.rst b/modules/stock/tests/scenario_stock_shipment_out.rst
index b364ba6864..a0efd459dc 100644
--- a/modules/stock/tests/scenario_stock_shipment_out.rst
+++ b/modules/stock/tests/scenario_stock_shipment_out.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Report
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import (
     ...     activate_modules, assertEqual, assertNotEqual, set_user)
 
@@ -17,12 +18,11 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
+    >>> config = activate_modules('stock', create_company)
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create customer::
 
@@ -81,7 +81,6 @@ Create Shipment Out::
     >>> shipment_out.planned_date = today
     >>> shipment_out.customer = customer
     >>> shipment_out.warehouse = warehouse_loc
-    >>> shipment_out.company = company
 
 Add two shipment lines of same product::
 
@@ -93,9 +92,8 @@ Add two shipment lines of same product::
     ...     move.quantity = 1
     ...     move.from_location = output_loc
     ...     move.to_location = customer_loc
-    ...     move.company = company
     ...     move.unit_price = Decimal('1')
-    ...     move.currency = company.currency
+    ...     move.currency = currency
     >>> shipment_out.save()
     >>> shipment_out.number
     >>> shipment_out.picked_by
@@ -127,9 +125,8 @@ Make 1 unit of the product available::
     >>> incoming_move.to_location = storage_loc
     >>> incoming_move.planned_date = today
     >>> incoming_move.effective_date = today
-    >>> incoming_move.company = company
     >>> incoming_move.unit_price = Decimal('1')
-    >>> incoming_move.currency = company.currency
+    >>> incoming_move.currency = currency
     >>> incoming_move.click('do')
 
 Assign the shipment now::
@@ -228,16 +225,14 @@ Create Shipment Out with effective date::
     >>> shipment_out.effective_date = yesterday
     >>> shipment_out.customer = customer
     >>> shipment_out.warehouse = warehouse_loc
-    >>> shipment_out.company = company
     >>> move = shipment_out.outgoing_moves.new()
     >>> move.product = product
     >>> move.unit = unit
     >>> move.quantity = 1
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
-    >>> move.company = company
     >>> move.unit_price = Decimal('1')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment_out.click('wait')
 
 Make 1 unit of the product available::
@@ -250,9 +245,8 @@ Make 1 unit of the product available::
     >>> incoming_move.to_location = storage_loc
     >>> incoming_move.planned_date = yesterday
     >>> incoming_move.effective_date = yesterday
-    >>> incoming_move.company = company
     >>> incoming_move.unit_price = Decimal('1')
-    >>> incoming_move.currency = company.currency
+    >>> incoming_move.currency = currency
     >>> incoming_move.click('do')
 
 Finish the shipment::
diff --git a/modules/stock/tests/scenario_stock_shipment_out_return.rst b/modules/stock/tests/scenario_stock_shipment_out_return.rst
index 5d9b8c69b1..4ba65c5448 100644
--- a/modules/stock/tests/scenario_stock_shipment_out_return.rst
+++ b/modules/stock/tests/scenario_stock_shipment_out_return.rst
@@ -7,22 +7,18 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Report
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertNotEqual
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
+    >>> config = activate_modules('stock', create_company)
 
     >>> Party = Model.get('party.party')
     >>> ProductUom = Model.get('product.uom')
     >>> ProductTemplate = Model.get('product.template')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create customer::
 
     >>> customer = Party(name='Customer')
@@ -52,7 +48,6 @@ Create Shipment Out Return::
     >>> shipment = ShipmentOutReturn()
     >>> shipment.customer = customer
     >>> shipment.warehouse = warehouse_loc
-    >>> shipment.company = company
     >>> move = shipment.incoming_moves.new()
     >>> move.product = product
     >>> move.unit = unit
@@ -60,7 +55,7 @@ Create Shipment Out Return::
     >>> move.from_location = customer_loc
     >>> move.to_location = warehouse_loc.input_location
     >>> move.unit_price = Decimal('20')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> shipment.save()
     >>> assertNotEqual(shipment.number, None)
 
diff --git a/modules/stock/tests/scenario_stock_shipment_out_return_same_storage_input.rst b/modules/stock/tests/scenario_stock_shipment_out_return_same_storage_input.rst
index a85db23650..30556e6a59 100644
--- a/modules/stock/tests/scenario_stock_shipment_out_return_same_storage_input.rst
+++ b/modules/stock/tests/scenario_stock_shipment_out_return_same_storage_input.rst
@@ -7,17 +7,13 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock', create_company)
 
 Create customer::
 
@@ -59,7 +55,6 @@ Create Shipment Out Return::
     >>> shipment = ShipmentOutReturn()
     >>> shipment.customer = customer
     >>> shipment.warehouse = warehouse_loc
-    >>> shipment.company = company
     >>> move = shipment.incoming_moves.new()
     >>> move.product = product
     >>> move.unit = unit
@@ -67,7 +62,7 @@ Create Shipment Out Return::
     >>> move.from_location = customer_loc
     >>> move.to_location = storage1
     >>> move.unit_price = Decimal('20')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> shipment.save()
 
     >>> len(shipment.incoming_moves)
diff --git a/modules/stock/tests/scenario_stock_shipment_out_same_storage_output.rst b/modules/stock/tests/scenario_stock_shipment_out_same_storage_output.rst
index be64e9c07e..f657215119 100644
--- a/modules/stock/tests/scenario_stock_shipment_out_same_storage_output.rst
+++ b/modules/stock/tests/scenario_stock_shipment_out_same_storage_output.rst
@@ -7,20 +7,16 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('stock')
+    >>> config = activate_modules('stock', create_company)
 
     >>> Move = Model.get('stock.move')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create customer::
 
     >>> Party = Model.get('party.party')
@@ -56,13 +52,12 @@ Create Shipment Out::
     >>> shipment_out = ShipmentOut()
     >>> shipment_out.customer = customer
     >>> shipment_out.warehouse = warehouse_loc
-    >>> shipment_out.company = company
     >>> move = shipment_out.outgoing_moves.new()
     >>> move.product = product
     >>> move.unit = unit
     >>> move.quantity = 1
     >>> move.unit_price = Decimal('5')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> move.from_location = storage_loc
     >>> move.to_location = customer_loc
     >>> shipment_out.save()
diff --git a/modules/stock_assign_manual/tests/scenario_stock_assign_manual.rst b/modules/stock_assign_manual/tests/scenario_stock_assign_manual.rst
index 6e21264734..d41a13cb41 100644
--- a/modules/stock_assign_manual/tests/scenario_stock_assign_manual.rst
+++ b/modules/stock_assign_manual/tests/scenario_stock_assign_manual.rst
@@ -8,17 +8,13 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Wizard
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate stock_assign_manual::
 
-    >>> config = activate_modules('stock_assign_manual')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock_assign_manual', create_company)
 
 Create customer::
 
@@ -59,7 +55,7 @@ Fill locations::
     >>> move.from_location = supplier_loc
     >>> move.to_location = storage_loc
     >>> move.unit_price = Decimal('5')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> move.click('do')
 
     >>> move = StockMove()
@@ -68,7 +64,7 @@ Fill locations::
     >>> move.from_location = supplier_loc
     >>> move.to_location = storage_loc2
     >>> move.unit_price = Decimal('5')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> move.click('do')
 
 Make a customer shipment::
@@ -83,7 +79,7 @@ Make a customer shipment::
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> move.unit_price = Decimal('20')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> move = shipment.outgoing_moves.new()
     >>> move.product = product
     >>> move.unit = unit
@@ -91,7 +87,7 @@ Make a customer shipment::
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> move.unit_price = Decimal('20')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> shipment.click('wait')
     >>> shipment.state
     'waiting'
diff --git a/modules/stock_consignment/tests/scenario_stock_consignment.rst b/modules/stock_consignment/tests/scenario_stock_consignment.rst
index 260180bab3..3bdcf955fd 100644
--- a/modules/stock_consignment/tests/scenario_stock_consignment.rst
+++ b/modules/stock_consignment/tests/scenario_stock_consignment.rst
@@ -9,22 +9,16 @@ Imports::
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import (
     ...     create_chart, create_tax, get_accounts)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('stock_consignment')
+    >>> config = activate_modules('stock_consignment', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
@@ -173,7 +167,7 @@ Use supplier consignment stock for shipment out::
     >>> move.product = product
     >>> move.quantity = 3
     >>> move.unit_price = Decimal('10')
-    >>> move.currency = company.currency
+    >>> move.currency = shipment_out.company.currency
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> shipment_out.click('wait')
diff --git a/modules/stock_consignment/tests/scenario_stock_consignment_supplier_customer.rst b/modules/stock_consignment/tests/scenario_stock_consignment_supplier_customer.rst
index ce34d04f43..fa1c0739ad 100644
--- a/modules/stock_consignment/tests/scenario_stock_consignment_supplier_customer.rst
+++ b/modules/stock_consignment/tests/scenario_stock_consignment_supplier_customer.rst
@@ -8,22 +8,16 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('stock_consignment')
+    >>> config = activate_modules('stock_consignment', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/stock_inventory_location/tests/scenario_stock_inventories.rst b/modules/stock_inventory_location/tests/scenario_stock_inventories.rst
index 250b3b2fd3..fd4d3df177 100644
--- a/modules/stock_inventory_location/tests/scenario_stock_inventories.rst
+++ b/modules/stock_inventory_location/tests/scenario_stock_inventories.rst
@@ -10,11 +10,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_inventory_location')
-
-Create company::
-
-    >>> _ = create_company()
+    >>> config = activate_modules('stock_inventory_location', create_company)
 
 Get stock locations::
 
diff --git a/modules/stock_location_move/tests/scenario_stock_location_move.rst b/modules/stock_location_move/tests/scenario_stock_location_move.rst
index 3136f82852..9daf9f1f47 100644
--- a/modules/stock_location_move/tests/scenario_stock_location_move.rst
+++ b/modules/stock_location_move/tests/scenario_stock_location_move.rst
@@ -7,7 +7,7 @@ Imports::
     >>> import datetime as dt
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -15,12 +15,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_location_move')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock_location_move', create_company)
 
 Get stock locations::
 
diff --git a/modules/stock_location_move/tests/scenario_stock_location_move_empty.rst b/modules/stock_location_move/tests/scenario_stock_location_move_empty.rst
index 0cdbbcf2fe..26224da9ab 100644
--- a/modules/stock_location_move/tests/scenario_stock_location_move_empty.rst
+++ b/modules/stock_location_move/tests/scenario_stock_location_move_empty.rst
@@ -17,11 +17,10 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_location_move')
+    >>> config = activate_modules('stock_location_move', create_company)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create customer::
diff --git a/modules/stock_location_move/tests/scenario_stock_location_move_supply.rst b/modules/stock_location_move/tests/scenario_stock_location_move_supply.rst
index 991855b91c..f0f3ced270 100644
--- a/modules/stock_location_move/tests/scenario_stock_location_move_supply.rst
+++ b/modules/stock_location_move/tests/scenario_stock_location_move_supply.rst
@@ -8,14 +8,16 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Wizard
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules(['stock_location_move', 'stock_supply'])
+    >>> config = activate_modules(
+    ...     ['stock_location_move', 'stock_supply'],
+    ...     create_company)
 
 Create customer::
 
@@ -23,11 +25,6 @@ Create customer::
     >>> customer = Party(name='Customer')
     >>> customer.save()
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Get stock locations::
 
     >>> Location = Model.get('stock.location')
diff --git a/modules/stock_lot/tests/scenario_stock_lot_assign_try.rst b/modules/stock_lot/tests/scenario_stock_lot_assign_try.rst
index 513e63b911..59fd3575b7 100644
--- a/modules/stock_lot/tests/scenario_stock_lot_assign_try.rst
+++ b/modules/stock_lot/tests/scenario_stock_lot_assign_try.rst
@@ -8,14 +8,15 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('stock_lot')
+    >>> config = activate_modules('stock_lot', create_company)
+
     >>> Inventory = Model.get('stock.inventory')
     >>> Location = Model.get('stock.location')
     >>> Lot = Model.get('stock.lot')
@@ -24,11 +25,6 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> ShipmentOut = Model.get('stock.shipment.out')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create customer::
 
     >>> customer = Party(name='Customer')
@@ -93,16 +89,15 @@ Create shipment out::
     >>> shipment.planned_date = today
     >>> shipment.customer = customer
     >>> shipment.warehouse = warehouse_loc
-    >>> shipment.company = company
     >>> move = shipment.outgoing_moves.new()
     >>> move.product = product
     >>> move.unit = unit
     >>> move.quantity = 10
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
-    >>> move.company = company
+    >>> move.company = shipment.company
     >>> move.unit_price = Decimal('1')
-    >>> move.currency = company.currency
+    >>> move.currency = shipment.company.currency
     >>> shipment.click('wait')
 
 Request specific lot in stock assignation::
diff --git a/modules/stock_lot/tests/scenario_stock_lot_inventory_count.rst b/modules/stock_lot/tests/scenario_stock_lot_inventory_count.rst
index 68f84d6d08..880c2226e3 100644
--- a/modules/stock_lot/tests/scenario_stock_lot_inventory_count.rst
+++ b/modules/stock_lot/tests/scenario_stock_lot_inventory_count.rst
@@ -5,12 +5,12 @@ Stock Lot Inventory Count Scenario
 Imports::
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('stock_lot')
+    >>> config = activate_modules('stock_lot', create_company)
     >>> config.skip_warning = True
 
     >>> Inventory = Model.get('stock.inventory')
@@ -19,11 +19,6 @@ Activate modules::
     >>> ProductTemplate = Model.get('product.template')
     >>> ProductUom = Model.get('product.uom')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Get stock location::
 
     >>> storage_loc, = Location.find([('code', '=', 'STO')])
diff --git a/modules/stock_lot/tests/scenario_stock_lot_move_add.rst b/modules/stock_lot/tests/scenario_stock_lot_move_add.rst
index be5741687d..4864e7ca8f 100644
--- a/modules/stock_lot/tests/scenario_stock_lot_move_add.rst
+++ b/modules/stock_lot/tests/scenario_stock_lot_move_add.rst
@@ -7,7 +7,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
@@ -15,12 +16,7 @@ Activate modules::
     >>> modules = ['stock_lot']
     >>> if globals().get('stock_split', False):
     ...     modules.append('stock_split')
-    >>> config = activate_modules(modules)
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules(modules, create_company)
 
 Create product::
 
@@ -51,7 +47,7 @@ Create a move::
     >>> move.product = product
     >>> move.quantity = 10
     >>> move.unit_price = Decimal('20')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> move.save()
 
 Create a lot::
diff --git a/modules/stock_lot/tests/scenario_stock_lot_shipment_in.rst b/modules/stock_lot/tests/scenario_stock_lot_shipment_in.rst
index 3805beeb89..38e2dd159b 100644
--- a/modules/stock_lot/tests/scenario_stock_lot_shipment_in.rst
+++ b/modules/stock_lot/tests/scenario_stock_lot_shipment_in.rst
@@ -7,12 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('stock_lot')
+    >>> config = activate_modules('stock_lot', create_company)
 
     >>> Location = Model.get('stock.location')
     >>> Lot = Model.get('stock.lot')
@@ -21,11 +21,6 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> ShipmentIn = Model.get('stock.shipment.in')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create supplier::
 
     >>> supplier = Party(name='Supplier')
@@ -65,7 +60,7 @@ Create a shipment::
     >>> move.from_location = supplier_loc
     >>> move.to_location = input_loc
     >>> move.unit_price = Decimal('5')
-    >>> move.currency = company.currency
+    >>> move.currency = shipment.company.currency
     >>> shipment.save()
 
 Receive the shipment with one lot::
diff --git a/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst b/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst
index 40e3183bed..c29ecccbd6 100644
--- a/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst
+++ b/modules/stock_lot/tests/scenario_stock_lot_shipment_out.rst
@@ -8,19 +8,15 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('stock_lot')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock_lot', create_company)
 
 Create customer::
 
@@ -59,16 +55,14 @@ Create Shipment Out::
     >>> shipment_out.planned_date = today
     >>> shipment_out.customer = customer
     >>> shipment_out.warehouse = warehouse_loc
-    >>> shipment_out.company = company
     >>> move = shipment_out.outgoing_moves.new()
     >>> move.product = product
     >>> move.unit = unit
     >>> move.quantity = 10
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
-    >>> move.company = company
     >>> move.unit_price = Decimal('1')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> shipment_out.save()
 
 Set the shipment state to waiting::
diff --git a/modules/stock_lot/tests/scenario_stock_lot_shipment_out_internal.rst b/modules/stock_lot/tests/scenario_stock_lot_shipment_out_internal.rst
index 861ec5a63b..d13b8b6403 100644
--- a/modules/stock_lot/tests/scenario_stock_lot_shipment_out_internal.rst
+++ b/modules/stock_lot/tests/scenario_stock_lot_shipment_out_internal.rst
@@ -8,7 +8,7 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual, assertTrue
 
     >>> today = dt.date.today()
@@ -17,7 +17,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_lot')
+    >>> config = activate_modules('stock_lot', create_company)
 
     >>> LeadTime = Model.get('stock.location.lead_time')
     >>> Location = Model.get('stock.location')
@@ -26,11 +26,6 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Shipment = Model.get('stock.shipment.internal')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create product::
 
     >>> unit, = ProductUom.find([('name', '=', 'Unit')])
diff --git a/modules/stock_lot/tests/scenario_stock_lot_trace.rst b/modules/stock_lot/tests/scenario_stock_lot_trace.rst
index b4c24ec9f5..f5b1286e1b 100644
--- a/modules/stock_lot/tests/scenario_stock_lot_trace.rst
+++ b/modules/stock_lot/tests/scenario_stock_lot_trace.rst
@@ -7,12 +7,13 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('stock_lot')
+    >>> config = activate_modules('stock_lot', create_company)
 
     >>> Location = Model.get('stock.location')
     >>> Lot = Model.get('stock.lot')
@@ -21,11 +22,6 @@ Activate modules::
     >>> ProductTemplate = Model.get('product.template')
     >>> UoM = Model.get('product.uom')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create product::
 
     >>> unit, = UoM.find([('name', '=', "Unit")])
@@ -53,7 +49,7 @@ Make some moves::
     >>> move_in.quantity = 10
     >>> move_in.from_location = supplier_loc
     >>> move_in.to_location = storage_loc
-    >>> move_in.currency = company.currency
+    >>> move_in.currency = get_currency()
     >>> move_in.unit_price = Decimal('0')
     >>> move_in.click('do')
     >>> move_in.state
@@ -63,7 +59,7 @@ Make some moves::
     >>> move_out.quantity = 2
     >>> move_out.from_location = storage_loc
     >>> move_out.to_location = customer_loc
-    >>> move_out.currency = company.currency
+    >>> move_out.currency = get_currency()
     >>> move_out.unit_price = Decimal('0')
     >>> move_out.click('do')
     >>> move_out.state
diff --git a/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst b/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst
index bf45af1f19..dfa95169d2 100644
--- a/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst
+++ b/modules/stock_lot_unit/tests/scenario_stock_lot_unit.rst
@@ -7,17 +7,17 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('stock_lot_unit')
+    >>> config = activate_modules('stock_lot_unit', create_company)
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create customer::
 
@@ -65,14 +65,14 @@ Create an incoming shipment without lot::
     >>> move1.product = product
     >>> move1.quantity = 60
     >>> move1.unit_price = Decimal('8')
-    >>> move1.currency = company.currency
+    >>> move1.currency = currency
     >>> move1.from_location = supplier_loc
     >>> move1.to_location = input_loc
     >>> move2 = shipment.incoming_moves.new()
     >>> move2.product = product
     >>> move2.quantity = 40
     >>> move2.unit_price = Decimal('8')
-    >>> move2.currency = company.currency
+    >>> move2.currency = currency
     >>> move2.from_location = supplier_loc
     >>> move2.to_location = input_loc
     >>> shipment.click('receive')
@@ -94,7 +94,7 @@ Let's ship a product with a lot::
     >>> move.product = product
     >>> move.quantity = 1
     >>> move.unit_price = Decimal('20')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> shipment.click('wait')
@@ -115,14 +115,14 @@ Let's ship now two times the same lot::
     >>> move1.product = product
     >>> move1.quantity = 1
     >>> move1.unit_price = Decimal('20')
-    >>> move1.currency = company.currency
+    >>> move1.currency = currency
     >>> move1.from_location = output_loc
     >>> move1.to_location = customer_loc
     >>> move2 = shipment.outgoing_moves.new()
     >>> move2.product = product
     >>> move2.quantity = 1
     >>> move2.unit_price = Decimal('20')
-    >>> move2.currency = company.currency
+    >>> move2.currency = currency
     >>> move2.from_location = output_loc
     >>> move2.to_location = customer_loc
     >>> shipment.click('wait')
@@ -148,7 +148,7 @@ Now let's ship one move with a quantity bigger than lot unit quantity::
     >>> move.product = product
     >>> move.quantity = 4
     >>> move.unit_price = Decimal('20')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> shipment.click('wait')
diff --git a/modules/stock_lot_unit/tests/scenario_stock_lot_unit_move_add.rst b/modules/stock_lot_unit/tests/scenario_stock_lot_unit_move_add.rst
index 0f4c2f0e0e..430dca4b78 100644
--- a/modules/stock_lot_unit/tests/scenario_stock_lot_unit_move_add.rst
+++ b/modules/stock_lot_unit/tests/scenario_stock_lot_unit_move_add.rst
@@ -7,17 +7,13 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('stock_lot_unit')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock_lot_unit', create_company)
 
 Create product::
 
@@ -48,7 +44,7 @@ Create a move::
     >>> move.product = product
     >>> move.quantity = 5
     >>> move.unit_price = Decimal('20')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> move.save()
 
 Create a lot::
diff --git a/modules/stock_package/tests/scenario_stock_package.rst b/modules/stock_package/tests/scenario_stock_package.rst
index 4ebdc0187b..39775425c3 100644
--- a/modules/stock_package/tests/scenario_stock_package.rst
+++ b/modules/stock_package/tests/scenario_stock_package.rst
@@ -8,19 +8,19 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('stock_package')
+    >>> config = activate_modules('stock_package', create_company)
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create customer::
 
@@ -58,7 +58,6 @@ Create Shipment Out::
     >>> shipment_out.planned_date = today
     >>> shipment_out.customer = customer
     >>> shipment_out.warehouse = warehouse_loc
-    >>> shipment_out.company = company
 
 Add two shipment lines of same product::
 
@@ -70,9 +69,8 @@ Add two shipment lines of same product::
     ...     move.quantity = 1
     ...     move.from_location = output_loc
     ...     move.to_location = customer_loc
-    ...     move.company = company
     ...     move.unit_price = Decimal('1')
-    ...     move.currency = company.currency
+    ...     move.currency = currency
     >>> shipment_out.save()
 
 Pack shipment::
diff --git a/modules/stock_package_shipping_dpd/tests/scenario_shipping_dpd.rst b/modules/stock_package_shipping_dpd/tests/scenario_shipping_dpd.rst
index 44b4f7813d..34021975c0 100644
--- a/modules/stock_package_shipping_dpd/tests/scenario_shipping_dpd.rst
+++ b/modules/stock_package_shipping_dpd/tests/scenario_shipping_dpd.rst
@@ -18,23 +18,21 @@ Imports::
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['stock_package_shipping_dpd', 'sale', 'sale_shipment_cost'])
+    ...     ['stock_package_shipping_dpd', 'sale', 'sale_shipment_cost'],
+    ...     create_company, create_chart)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/stock_package_shipping_mygls/tests/scenario_stock_package_shipping_mygls.rst b/modules/stock_package_shipping_mygls/tests/scenario_stock_package_shipping_mygls.rst
index db800f9bdb..4dd30d2e9a 100644
--- a/modules/stock_package_shipping_mygls/tests/scenario_stock_package_shipping_mygls.rst
+++ b/modules/stock_package_shipping_mygls/tests/scenario_stock_package_shipping_mygls.rst
@@ -19,7 +19,8 @@ Imports::
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['stock_package_shipping_mygls', 'sale', 'sale_shipment_cost'])
+    ...     ['stock_package_shipping_mygls', 'sale', 'sale_shipment_cost'],
+    ...     create_company, create_chart)
 
     >>> Address = Model.get('party.address')
     >>> Carrier = Model.get('carrier')
@@ -34,21 +35,18 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Sale = Model.get('sale.sale')
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create countries::
 
diff --git a/modules/stock_package_shipping_sendcloud/tests/scenario_stock_package_shipping_sendcloud.rst b/modules/stock_package_shipping_sendcloud/tests/scenario_stock_package_shipping_sendcloud.rst
index c8c55748e3..70be946f9a 100644
--- a/modules/stock_package_shipping_sendcloud/tests/scenario_stock_package_shipping_sendcloud.rst
+++ b/modules/stock_package_shipping_sendcloud/tests/scenario_stock_package_shipping_sendcloud.rst
@@ -23,7 +23,8 @@ Imports::
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['stock_package_shipping_sendcloud', 'sale', 'sale_shipment_cost'])
+    ...     ['stock_package_shipping_sendcloud', 'sale', 'sale_shipment_cost'],
+    ...     create_company, create_chart)
 
     >>> Address = Model.get('party.address')
     >>> Carrier = Model.get('carrier')
@@ -42,21 +43,18 @@ Activate modules::
     >>> StockConfiguration = Model.get('stock.configuration')
     >>> UoM = Model.get('product.uom')
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Set random sequence::
 
diff --git a/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst b/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst
index 18a5439819..c32c11bd48 100644
--- a/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst
+++ b/modules/stock_package_shipping_ups/tests/scenario_shipping_ups.rst
@@ -18,23 +18,21 @@ Imports::
 Activate modules::
 
     >>> config = activate_modules(
-    ...     ['stock_package_shipping_ups', 'sale', 'sale_shipment_cost'])
+    ...     ['stock_package_shipping_ups', 'sale', 'sale_shipment_cost'],
+    ...     create_company, create_chart)
 
-Create company::
+Get company::
 
-    >>> _ = create_company()
     >>> company = get_company()
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
-Create chart of accounts::
+Get accounts::
 
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> revenue = accounts['revenue']
     >>> expense = accounts['expense']
 
diff --git a/modules/stock_product_location/tests/scenario_product_copy_locations.rst b/modules/stock_product_location/tests/scenario_product_copy_locations.rst
index ddb496c167..138cdea340 100644
--- a/modules/stock_product_location/tests/scenario_product_copy_locations.rst
+++ b/modules/stock_product_location/tests/scenario_product_copy_locations.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('stock_product_location')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock_product_location', create_company)
 
 Get stock locations::
 
diff --git a/modules/stock_product_location/tests/scenario_stock_product_location.rst b/modules/stock_product_location/tests/scenario_stock_product_location.rst
index 79f7782bd1..309fb029ce 100644
--- a/modules/stock_product_location/tests/scenario_stock_product_location.rst
+++ b/modules/stock_product_location/tests/scenario_stock_product_location.rst
@@ -8,19 +8,19 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('stock_product_location')
+    >>> config = activate_modules('stock_product_location', create_company)
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create customer::
 
@@ -77,7 +77,6 @@ Create Shipment in::
     >>> shipment_in.planned_date = today
     >>> shipment_in.supplier = supplier
     >>> shipment_in.warehouse = warehouse_loc
-    >>> shipment_in.company = company
 
 Add one shipment line of product::
 
@@ -87,9 +86,8 @@ Add one shipment line of product::
     >>> move.quantity = 1
     >>> move.from_location = supplier_loc
     >>> move.to_location = input_loc
-    >>> move.company = company
     >>> move.unit_price = Decimal('1')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment_in.save()
 
 Test that to_location is child location on reception::
@@ -113,9 +111,8 @@ Add one shipment return line::
     >>> move.quantity = 1
     >>> move.from_location = customer_loc
     >>> move.to_location = input_loc
-    >>> move.company = company
     >>> move.unit_price = Decimal('1')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment_out_return.save()
 
 Test that to_location is child location on reception::
diff --git a/modules/stock_product_location/tests/scenario_stock_product_location_consumable.rst b/modules/stock_product_location/tests/scenario_stock_product_location_consumable.rst
index 4f7bcf6b15..7759258e97 100644
--- a/modules/stock_product_location/tests/scenario_stock_product_location_consumable.rst
+++ b/modules/stock_product_location/tests/scenario_stock_product_location_consumable.rst
@@ -12,7 +12,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_product_location')
+    >>> config = activate_modules('stock_product_location', create_company)
 
     >>> Location = Model.get('stock.location')
     >>> Party = Model.get('party.party')
@@ -20,10 +20,6 @@ Activate modules::
     >>> ShipmentOut = Model.get('stock.shipment.out')
     >>> UoM = Model.get('product.uom')
 
-Create company::
-
-    >>> _ = create_company()
-
 Create customer::
 
     >>> customer = Party(name="Customer")
diff --git a/modules/stock_product_location/tests/scenario_stock_product_location_production.rst b/modules/stock_product_location/tests/scenario_stock_product_location_production.rst
index fe07d3161e..b3d67c4b60 100644
--- a/modules/stock_product_location/tests/scenario_stock_product_location_production.rst
+++ b/modules/stock_product_location/tests/scenario_stock_product_location_production.rst
@@ -15,11 +15,7 @@ Imports::
 
 Activate modules::
 
-    >>> _ = activate_modules(['stock_product_location', 'production'])
-
-Create company::
-
-    >>> _ = create_company()
+    >>> _ = activate_modules(['stock_product_location', 'production'], create_company)
 
 Get stock locations::
 
diff --git a/modules/stock_product_location/tests/scenario_stock_product_location_template.rst b/modules/stock_product_location/tests/scenario_stock_product_location_template.rst
index 4ba2983330..2ea44f32ce 100644
--- a/modules/stock_product_location/tests/scenario_stock_product_location_template.rst
+++ b/modules/stock_product_location/tests/scenario_stock_product_location_template.rst
@@ -8,19 +8,19 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('stock_product_location')
+    >>> config = activate_modules('stock_product_location', create_company)
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create customer::
 
@@ -76,7 +76,6 @@ Create Shipment in::
     >>> shipment_in.planned_date = today
     >>> shipment_in.supplier = supplier
     >>> shipment_in.warehouse = warehouse_loc
-    >>> shipment_in.company = company
 
 Add one shipment line of product::
 
@@ -86,9 +85,8 @@ Add one shipment line of product::
     >>> move.quantity = 1
     >>> move.from_location = supplier_loc
     >>> move.to_location = input_loc
-    >>> move.company = company
     >>> move.unit_price = Decimal('1')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment_in.save()
 
 Test that to_location is child location on reception::
@@ -112,9 +110,8 @@ Add one shipment return line::
     >>> move.quantity = 1
     >>> move.from_location = customer_loc
     >>> move.to_location = input_loc
-    >>> move.company = company
     >>> move.unit_price = Decimal('1')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment_out_return.save()
 
 Test that to_location is child location on reception::
diff --git a/modules/stock_product_location_place/tests/scenario_stock_product_location_place.rst b/modules/stock_product_location_place/tests/scenario_stock_product_location_place.rst
index 90bc8c4747..8e028e8c8b 100644
--- a/modules/stock_product_location_place/tests/scenario_stock_product_location_place.rst
+++ b/modules/stock_product_location_place/tests/scenario_stock_product_location_place.rst
@@ -12,17 +12,13 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_product_location_place')
+    >>> config = activate_modules('stock_product_location_place', create_company)
 
     >>> Location = Model.get('stock.location')
     >>> Move = Model.get('stock.move')
     >>> ProductTemplate = Model.get('product.template')
     >>> UoM = Model.get('product.uom')
 
-Create company::
-
-    >>> _ = create_company()
-
 Get location::
 
     >>> storage_loc, = Location.find([('code', '=', 'STO')])
diff --git a/modules/stock_product_location_place/tests/scenario_stock_product_location_place_copy.rst b/modules/stock_product_location_place/tests/scenario_stock_product_location_place_copy.rst
index abdfb6d6ca..9f1ed632f4 100644
--- a/modules/stock_product_location_place/tests/scenario_stock_product_location_place_copy.rst
+++ b/modules/stock_product_location_place/tests/scenario_stock_product_location_place_copy.rst
@@ -12,16 +12,12 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_product_location_place')
+    >>> config = activate_modules('stock_product_location_place', create_company)
 
     >>> Location = Model.get('stock.location')
     >>> ProductTemplate = Model.get('product.template')
     >>> UoM = Model.get('product.uom')
 
-Create company::
-
-    >>> _ = create_company()
-
 Get location::
 
     >>> storage_loc, = Location.find([('code', '=', 'STO')])
diff --git a/modules/stock_product_location_place/tests/scenario_stock_product_location_place_modification.rst b/modules/stock_product_location_place/tests/scenario_stock_product_location_place_modification.rst
index 32757f54bc..175d5590a0 100644
--- a/modules/stock_product_location_place/tests/scenario_stock_product_location_place_modification.rst
+++ b/modules/stock_product_location_place/tests/scenario_stock_product_location_place_modification.rst
@@ -7,23 +7,19 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
 Activate modules::
 
-    >>> config = activate_modules('stock_product_location_place')
+    >>> config = activate_modules('stock_product_location_place', create_company)
 
     >>> Location = Model.get('stock.location')
     >>> Move = Model.get('stock.move')
     >>> ProductTemplate = Model.get('product.template')
     >>> UoM = Model.get('product.uom')
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Get location::
 
     >>> supplier_loc, = Location.find([('code', '=', 'SUP')])
@@ -58,7 +54,7 @@ Create a stock move::
     >>> move.to_location = storage_loc
     >>> move.quantity = 1
     >>> move.unit_price = Decimal(10)
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> move.save()
 
     >>> move.to_place.rec_name
diff --git a/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning.rst b/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning.rst
index 096a7cd9c9..9b49b2ab64 100644
--- a/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning.rst
+++ b/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Wizard
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -19,9 +20,8 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_quantity_early_planning')
+    >>> config = activate_modules('stock_quantity_early_planning', create_company)
 
-    >>> Company = Model.get('company.company')
     >>> Location = Model.get('stock.location')
     >>> Move = Model.get('stock.move')
     >>> Party = Model.get('party.party')
@@ -31,10 +31,9 @@ Activate modules::
     >>> QuantityEarlyPlan = Model.get('stock.quantity.early_plan')
     >>> ShipmentOut = Model.get('stock.shipment.out')
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create parties::
 
@@ -71,7 +70,7 @@ Plan receiving some products tomorrow and in 2 week::
     ...     move.from_location = supplier_loc
     ...     move.to_location = input_loc
     ...     move.unit_price = product.cost_price
-    ...     move.currency = company.currency
+    ...     move.currency = currency
     ...     move.planned_date = date
     ...     move.save()
 
@@ -92,14 +91,14 @@ Plan to ship some products in 3 weeks::
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> move.unit_price = product1.list_price
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> move = shipment_out1.outgoing_moves.new()
     >>> move.product = product2
     >>> move.quantity = 6
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> move.unit_price = product2.list_price
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment_out1.save()
 
     >>> shipment_out2 = ShipmentOut()
@@ -111,7 +110,7 @@ Plan to ship some products in 3 weeks::
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> move.unit_price = product1.list_price
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment_out2.save()
 
     >>> shipment_out3 = ShipmentOut()
@@ -123,7 +122,7 @@ Plan to ship some products in 3 weeks::
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> move.unit_price = product1.list_price
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment_out3.save()
 
     >>> ShipmentOut.click([shipment_out1, shipment_out2, shipment_out3], 'wait')
diff --git a/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning_incoming.rst b/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning_incoming.rst
index c5b3858164..de776d4cab 100644
--- a/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning_incoming.rst
+++ b/modules/stock_quantity_early_planning/tests/scenario_stock_quantity_early_planning_incoming.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Wizard
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -18,7 +19,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_quantity_early_planning')
+    >>> config = activate_modules('stock_quantity_early_planning', create_company)
 
     >>> Company = Model.get('company.company')
     >>> Location = Model.get('stock.location')
@@ -31,10 +32,9 @@ Activate modules::
     >>> ShipmentOut = Model.get('stock.shipment.out')
     >>> ShipmentInternal = Model.get('stock.shipment.internal')
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create parties::
 
@@ -73,7 +73,7 @@ Plan receiving some products in 1 week in second warehouse::
     ...     move.from_location = supplier_loc
     ...     move.to_location = warehouse2.input_location
     ...     move.unit_price = product.cost_price
-    ...     move.currency = company.currency
+    ...     move.currency = currency
     ...     move.planned_date = date
     ...     move.save()
 
@@ -119,7 +119,7 @@ Plan to ship in 3 weeks::
     >>> move.from_location = warehouse.output_location
     >>> move.to_location = customer_loc
     >>> move.unit_price = product.list_price
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment_out.save()
     >>> shipment_out.click('wait')
 
diff --git a/modules/stock_quantity_issue/tests/scenario_stock_quantity_issue.rst b/modules/stock_quantity_issue/tests/scenario_stock_quantity_issue.rst
index 47c50132a9..9fc059515c 100644
--- a/modules/stock_quantity_issue/tests/scenario_stock_quantity_issue.rst
+++ b/modules/stock_quantity_issue/tests/scenario_stock_quantity_issue.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -18,9 +19,8 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_quantity_issue')
+    >>> config = activate_modules('stock_quantity_issue', create_company)
 
-    >>> Company = Model.get('company.company')
     >>> Cron = Model.get('ir.cron')
     >>> Location = Model.get('stock.location')
     >>> Move = Model.get('stock.move')
@@ -30,10 +30,9 @@ Activate modules::
     >>> QuantityIssue = Model.get('stock.quantity.issue')
     >>> ShipmentOut = Model.get('stock.shipment.out')
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create parties::
 
@@ -66,7 +65,7 @@ Plan receiving some products tomorrow and in 2 week::
     >>> move.from_location = supplier_loc
     >>> move.to_location = input_loc
     >>> move.unit_price = Decimal('5')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> move.planned_date = today
     >>> move.save()
 
@@ -87,7 +86,7 @@ Plan to ship some products in 1 week::
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> move.unit_price = Decimal('20')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment_out1.save()
 
     >>> shipment_out2, = ShipmentOut.duplicate([shipment_out1])
diff --git a/modules/stock_shipment_cost/tests/scenario_stock_shipment_cost.rst b/modules/stock_shipment_cost/tests/scenario_stock_shipment_cost.rst
index 6b54492649..cefe162ece 100644
--- a/modules/stock_shipment_cost/tests/scenario_stock_shipment_cost.rst
+++ b/modules/stock_shipment_cost/tests/scenario_stock_shipment_cost.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules
 
     >>> today = dt.date.today()
@@ -16,12 +17,11 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_shipment_cost')
+    >>> config = activate_modules('stock_shipment_cost', create_company)
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create customer::
 
@@ -73,21 +73,21 @@ Create a customer shipment::
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> move.unit_price = Decimal('30')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> move = shipment.outgoing_moves.new()
     >>> move.product = product2
     >>> move.quantity = 2
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> move.unit_price = Decimal('40')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment.click('wait')
     >>> shipment.click('assign_force')
     >>> shipment.click('pick')
     >>> shipment.click('pack')
     >>> shipment.cost_edit = True
     >>> shipment.cost_used = Decimal('5')
-    >>> shipment.cost_currency_used = company.currency
+    >>> shipment.cost_currency_used = currency
     >>> shipment.click('do')
     >>> shipment.state
     'done'
diff --git a/modules/stock_shipment_cost_weight/tests/scenario_stock_shipment_cost_weight.rst b/modules/stock_shipment_cost_weight/tests/scenario_stock_shipment_cost_weight.rst
index c94ff58e75..a27c2d17a7 100644
--- a/modules/stock_shipment_cost_weight/tests/scenario_stock_shipment_cost_weight.rst
+++ b/modules/stock_shipment_cost_weight/tests/scenario_stock_shipment_cost_weight.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from unittest.mock import patch
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.modules.stock_shipment_cost.stock import ShipmentCostMixin
     >>> from trytond.tests.tools import activate_modules
 
@@ -20,7 +21,7 @@ Patch _get_shipment_cost::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_shipment_cost_weight')
+    >>> config = activate_modules('stock_shipment_cost_weight', create_company)
 
     >>> Carrier = Model.get('carrier')
     >>> Location = Model.get('stock.location')
@@ -29,10 +30,9 @@ Activate modules::
     >>> ProductUom = Model.get('product.uom')
     >>> Shipment = Model.get('stock.shipment.out')
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create customer::
 
@@ -98,14 +98,14 @@ Create a customer shipment::
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> move.unit_price = Decimal('30')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> move = shipment.outgoing_moves.new()
     >>> move.product = product2
     >>> move.quantity = 2
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
     >>> move.unit_price = Decimal('40')
-    >>> move.currency = company.currency
+    >>> move.currency = currency
     >>> shipment.click('wait')
     >>> shipment.click('assign_force')
     >>> shipment.click('pick')
diff --git a/modules/stock_split/tests/scenario_stock_split_shipment.rst b/modules/stock_split/tests/scenario_stock_split_shipment.rst
index 825ff1cb75..7ecbc58c3b 100644
--- a/modules/stock_split/tests/scenario_stock_split_shipment.rst
+++ b/modules/stock_split/tests/scenario_stock_split_shipment.rst
@@ -7,17 +7,17 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('stock_split')
+    >>> config = activate_modules('stock_split', create_company)
 
-Create company::
+Get currency::
 
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> currency = get_currency()
 
 Create customer::
 
@@ -62,7 +62,7 @@ Create shipment with 2 lines::
     ...     move.from_location = output_loc
     ...     move.to_location = customer_loc
     ...     move.unit_price = Decimal(1)
-    ...     move.currency = company.currency
+    ...     move.currency = currency
 
     >>> shipment1.save()
     >>> move1, move2 = shipment1.outgoing_moves
diff --git a/modules/stock_supply/tests/scenario_stock_internal_supply.rst b/modules/stock_supply/tests/scenario_stock_internal_supply.rst
index 3381fd36f3..9afc65fce4 100644
--- a/modules/stock_supply/tests/scenario_stock_internal_supply.rst
+++ b/modules/stock_supply/tests/scenario_stock_internal_supply.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Wizard
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, set_user
 
 Activate modules::
 
-    >>> config = activate_modules('stock_supply')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock_supply', create_company)
 
 Create stock admin user::
 
diff --git a/modules/stock_supply/tests/scenario_stock_internal_supply_lead_time.rst b/modules/stock_supply/tests/scenario_stock_internal_supply_lead_time.rst
index 3324870732..0da08455ad 100644
--- a/modules/stock_supply/tests/scenario_stock_internal_supply_lead_time.rst
+++ b/modules/stock_supply/tests/scenario_stock_internal_supply_lead_time.rst
@@ -8,7 +8,8 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Wizard
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -16,7 +17,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_supply')
+    >>> config = activate_modules('stock_supply', create_company)
 
 Create customer::
 
@@ -24,11 +25,6 @@ Create customer::
     >>> customer = Party(name='Customer')
     >>> customer.save()
 
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
-
 Create product::
 
     >>> ProductUom = Model.get('product.uom')
@@ -101,7 +97,7 @@ Create needs for tomorrow in second warehouse::
     >>> move.from_location = sec_warehouse_loc.output_location
     >>> move.to_location = customer_loc
     >>> move.unit_price = Decimal('20')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> shipment.click('wait')
     >>> shipment.state
     'waiting'
diff --git a/modules/stock_supply/tests/scenario_stock_internal_supply_overflow.rst b/modules/stock_supply/tests/scenario_stock_internal_supply_overflow.rst
index 686a02ea33..3688d3f8b6 100644
--- a/modules/stock_supply/tests/scenario_stock_internal_supply_overflow.rst
+++ b/modules/stock_supply/tests/scenario_stock_internal_supply_overflow.rst
@@ -7,17 +7,12 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Wizard
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
 Activate modules::
 
-    >>> config = activate_modules('stock_supply')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock_supply', create_company)
 
 Create product::
 
diff --git a/modules/stock_supply/tests/scenario_stock_supply_purchase_request.rst b/modules/stock_supply/tests/scenario_stock_supply_purchase_request.rst
index ae5679fcc9..0d7c101fec 100644
--- a/modules/stock_supply/tests/scenario_stock_supply_purchase_request.rst
+++ b/modules/stock_supply/tests/scenario_stock_supply_purchase_request.rst
@@ -9,24 +9,19 @@ Imports::
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
+    >>> from trytond.modules.currency.tests.tools import get_currency
     >>> from trytond.tests.tools import activate_modules, assertEqual, set_user
 
     >>> today = dt.date.today()
 
 Activate modules::
 
-    >>> config = activate_modules('stock_supply')
+    >>> config = activate_modules('stock_supply', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
 
 Create parties::
@@ -141,16 +136,14 @@ Create needs for missing product::
     >>> shipment_out.effective_date = today
     >>> shipment_out.customer = customer
     >>> shipment_out.warehouse = warehouse_loc
-    >>> shipment_out.company = company
     >>> move = shipment_out.outgoing_moves.new()
     >>> move.product = product
     >>> move.unit = unit
     >>> move.quantity = 1
     >>> move.from_location = output_loc
     >>> move.to_location = customer_loc
-    >>> move.company = company
     >>> move.unit_price = Decimal('1')
-    >>> move.currency = company.currency
+    >>> move.currency = get_currency()
     >>> shipment_out.click('wait')
 
     >>> shipment_out, = shipment_out.duplicate(
diff --git a/modules/stock_supply_forecast/tests/scenario_stock_supply_forecast.rst b/modules/stock_supply_forecast/tests/scenario_stock_supply_forecast.rst
index cf73b90f0a..7c072c9326 100644
--- a/modules/stock_supply_forecast/tests/scenario_stock_supply_forecast.rst
+++ b/modules/stock_supply_forecast/tests/scenario_stock_supply_forecast.rst
@@ -9,7 +9,7 @@ Imports::
 
     >>> from proteus import Model, Wizard
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> today = dt.date.today()
@@ -18,17 +18,12 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_supply_forecast')
+    >>> config = activate_modules(
+    ...     'stock_supply_forecast', create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
     >>> expense = accounts['expense']
 
 Create parties::
diff --git a/modules/stock_supply_production/tests/scenario_stock_supply_production.rst b/modules/stock_supply_production/tests/scenario_stock_supply_production.rst
index b5c9231e55..151cbf26a1 100644
--- a/modules/stock_supply_production/tests/scenario_stock_supply_production.rst
+++ b/modules/stock_supply_production/tests/scenario_stock_supply_production.rst
@@ -8,7 +8,7 @@ Imports::
     >>> from decimal import Decimal
 
     >>> from proteus import Model, Wizard
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.stock.exceptions import MoveFutureWarning
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
@@ -16,12 +16,7 @@ Imports::
 
 Activate modules::
 
-    >>> config = activate_modules('stock_supply_production')
-
-Create company::
-
-    >>> _ = create_company()
-    >>> company = get_company()
+    >>> config = activate_modules('stock_supply_production', create_company)
 
 Create product::
 
diff --git a/modules/web_shop_shopify/tests/scenario_web_shop_shopify.rst b/modules/web_shop_shopify/tests/scenario_web_shop_shopify.rst
index fa779fa8d1..79d6a6381a 100644
--- a/modules/web_shop_shopify/tests/scenario_web_shop_shopify.rst
+++ b/modules/web_shop_shopify/tests/scenario_web_shop_shopify.rst
@@ -19,7 +19,7 @@ Imports::
     ...     create_chart, create_fiscalyear, create_tax, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.web_shop_shopify.product import Template
     >>> from trytond.modules.web_shop_shopify.web import Shop
     >>> from trytond.tests.tools import activate_modules, assertEqual
@@ -36,7 +36,8 @@ Activate modules::
     ...         'product_image',
     ...         'sale_discount',
     ...         'sale_shipment_cost',
-    ...         ])
+    ...         ],
+    ...     create_company, create_chart)
 
     >>> Account = Model.get('account.account')
     >>> Carrier = Model.get('carrier')
@@ -83,15 +84,9 @@ Create country::
     >>> china = Country(name="China", code='CN')
     >>> china.save()
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create tax::
 
@@ -99,8 +94,7 @@ Create tax::
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
 Create payment journal::
diff --git a/modules/web_shop_shopify/tests/scenario_web_shop_shopify_secondary_unit.rst b/modules/web_shop_shopify/tests/scenario_web_shop_shopify_secondary_unit.rst
index 63da6a7fcc..420515bf51 100644
--- a/modules/web_shop_shopify/tests/scenario_web_shop_shopify_secondary_unit.rst
+++ b/modules/web_shop_shopify/tests/scenario_web_shop_shopify_secondary_unit.rst
@@ -18,7 +18,7 @@ Imports::
     ...     create_chart, create_fiscalyear, get_accounts)
     >>> from trytond.modules.account_invoice.tests.tools import (
     ...     set_fiscalyear_invoice_sequences)
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.tests.tools import activate_modules, assertEqual
 
     >>> FETCH_SLEEP, MAX_SLEEP = 1, 10
@@ -28,7 +28,8 @@ Activate modules::
     >>> config = activate_modules([
     ...         'web_shop_shopify',
     ...         'sale_secondary_unit',
-    ...         ])
+    ...         ],
+    ...     create_company, create_chart)
 
     >>> Account = Model.get('account.account')
     >>> Category = Model.get('product.category')
@@ -42,20 +43,13 @@ Activate modules::
     >>> Uom = Model.get('product.uom')
     >>> WebShop = Model.get('web.shop')
 
-Create company::
+Get accounts::
 
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Create fiscal year::
 
-    >>> fiscalyear = set_fiscalyear_invoice_sequences(
-    ...     create_fiscalyear(company))
+    >>> fiscalyear = set_fiscalyear_invoice_sequences(create_fiscalyear())
     >>> fiscalyear.click('create_period')
 
 Create payment journal::
diff --git a/modules/web_shop_vue_storefront/tests/scenario_web_shop_vue_storefront.rst b/modules/web_shop_vue_storefront/tests/scenario_web_shop_vue_storefront.rst
index a65d271a7b..75c5b14d24 100644
--- a/modules/web_shop_vue_storefront/tests/scenario_web_shop_vue_storefront.rst
+++ b/modules/web_shop_vue_storefront/tests/scenario_web_shop_vue_storefront.rst
@@ -10,7 +10,7 @@ Imports::
 
     >>> from proteus import Model
     >>> from trytond.modules.account.tests.tools import create_chart, get_accounts
-    >>> from trytond.modules.company.tests.tools import create_company, get_company
+    >>> from trytond.modules.company.tests.tools import create_company
     >>> from trytond.modules.web_shop_vue_storefront import web
     >>> from trytond.modules.web_shop_vue_storefront.tests.tools import AnyDictWith
     >>> from trytond.tests.tools import activate_modules
@@ -33,18 +33,12 @@ Patch elasticsearch::
 Install web_shop_vue_storefront::
 
     >>> config = activate_modules(
-    ...     ['web_shop_vue_storefront', 'product_attribute', 'product_image'])
+    ...     ['web_shop_vue_storefront', 'product_attribute', 'product_image'],
+    ...     create_company, create_chart)
 
-Create company::
+Get accounts::
 
-    >>> Company = Model.get('company.company')
-    >>> _ = create_company()
-    >>> company = get_company()
-
-Create chart of accounts::
-
-    >>> _ = create_chart(company)
-    >>> accounts = get_accounts(company)
+    >>> accounts = get_accounts()
 
 Define a web shop::