diff --git a/migration_templates/d6_ubercart_order.yml b/modules/ubercart/migration_templates/d6_ubercart_order.yml
similarity index 100%
rename from migration_templates/d6_ubercart_order.yml
rename to modules/ubercart/migration_templates/d6_ubercart_order.yml
diff --git a/migration_templates/d6_ubercart_order_product.yml b/modules/ubercart/migration_templates/d6_ubercart_order_product.yml
similarity index 100%
rename from migration_templates/d6_ubercart_order_product.yml
rename to modules/ubercart/migration_templates/d6_ubercart_order_product.yml
diff --git a/migration_templates/d6_ubercart_product.yml b/modules/ubercart/migration_templates/d6_ubercart_product.yml
similarity index 100%
rename from migration_templates/d6_ubercart_product.yml
rename to modules/ubercart/migration_templates/d6_ubercart_product.yml
diff --git a/migration_templates/d6_ubercart_product_variation.yml b/modules/ubercart/migration_templates/d6_ubercart_product_variation.yml
similarity index 100%
rename from migration_templates/d6_ubercart_product_variation.yml
rename to modules/ubercart/migration_templates/d6_ubercart_product_variation.yml
diff --git a/migration_templates/d6_ubercart_store.yml b/modules/ubercart/migration_templates/d6_ubercart_store.yml
similarity index 100%
rename from migration_templates/d6_ubercart_store.yml
rename to modules/ubercart/migration_templates/d6_ubercart_store.yml
diff --git a/migration_templates/ubercart_currency.yml b/modules/ubercart/migration_templates/ubercart_currency.yml
similarity index 100%
rename from migration_templates/ubercart_currency.yml
rename to modules/ubercart/migration_templates/ubercart_currency.yml
diff --git a/src/Plugin/migrate/source/ubercart/Currency.php b/modules/ubercart/src/Plugin/migrate/source/Currency.php
similarity index 95%
rename from src/Plugin/migrate/source/ubercart/Currency.php
rename to modules/ubercart/src/Plugin/migrate/source/Currency.php
index 5cd88bd..c905554 100644
--- a/src/Plugin/migrate/source/ubercart/Currency.php
+++ b/modules/ubercart/src/Plugin/migrate/source/Currency.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\ubercart;
+namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source;
 
 use Drupal\commerce_price\CurrencyImporter;
 use Drupal\migrate\Row;
@@ -16,7 +16,8 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
  * Gets the ubercart currency data.
  *
  * @MigrateSource(
- *   id = "ubercart_currency"
+ *   id = "ubercart_currency",
+ *   source_provider = "uc_store"
  * )
  */
 class Currency extends Variable {
diff --git a/src/Plugin/migrate/source/ubercart/Store.php b/modules/ubercart/src/Plugin/migrate/source/Store.php
similarity index 88%
rename from src/Plugin/migrate/source/ubercart/Store.php
rename to modules/ubercart/src/Plugin/migrate/source/Store.php
index 49f1a1a..d54d5c0 100644
--- a/src/Plugin/migrate/source/ubercart/Store.php
+++ b/modules/ubercart/src/Plugin/migrate/source/Store.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\ubercart;
+namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\Variable;
@@ -9,7 +9,8 @@ use Drupal\migrate_drupal\Plugin\migrate\source\Variable;
  * Gets the ubercart store data.
  *
  * @MigrateSource(
- *   id = "ubercart_store"
+ *   id = "ubercart_store",
+ *   source_provider = "uc_store"
  * )
  */
 class Store extends Variable {
diff --git a/modules/ubercart/src/Plugin/migrate/source/d6/BillingProfile.php b/modules/ubercart/src/Plugin/migrate/source/d6/BillingProfile.php
index 43c021a..46abfd0 100644
--- a/modules/ubercart/src/Plugin/migrate/source/d6/BillingProfile.php
+++ b/modules/ubercart/src/Plugin/migrate/source/d6/BillingProfile.php
@@ -9,7 +9,8 @@ use Drupal\migrate\Row;
  * Drupal 6 ubercart billing profile source.
  *
  * @MigrateSource(
- *   id = "d6_ubercart_billing_profile"
+ *   id = "d6_ubercart_billing_profile",
+ *   source_provider = "uc_order"
  * )
  */
 class BillingProfile extends SqlBase {
diff --git a/src/Plugin/migrate/source/ubercart/d6/Order.php b/modules/ubercart/src/Plugin/migrate/source/d6/Order.php
similarity index 92%
rename from src/Plugin/migrate/source/ubercart/d6/Order.php
rename to modules/ubercart/src/Plugin/migrate/source/d6/Order.php
index 6e39f9c..d3864af 100644
--- a/src/Plugin/migrate/source/ubercart/d6/Order.php
+++ b/modules/ubercart/src/Plugin/migrate/source/d6/Order.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\ubercart\d6;
+namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Plugin\migrate\source\SqlBase;
 use Drupal\migrate\Row;
@@ -9,7 +9,8 @@ use Drupal\migrate\Row;
  * Provides migration source for orders.
  *
  * @MigrateSource(
- *   id = "d6_ubercart_order"
+ *   id = "d6_ubercart_order",
+ *   source_provider = "uc_order"
  * )
  */
 class Order extends SqlBase {
diff --git a/src/Plugin/migrate/source/ubercart/d6/OrderProduct.php b/modules/ubercart/src/Plugin/migrate/source/d6/OrderProduct.php
similarity index 81%
rename from src/Plugin/migrate/source/ubercart/d6/OrderProduct.php
rename to modules/ubercart/src/Plugin/migrate/source/d6/OrderProduct.php
index 23c6c95..c073ee0 100644
--- a/src/Plugin/migrate/source/ubercart/d6/OrderProduct.php
+++ b/modules/ubercart/src/Plugin/migrate/source/d6/OrderProduct.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\ubercart\d6;
+namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Plugin\migrate\source\SqlBase;
 use Drupal\migrate\Row;
 
 /**
+ * Drupal 6 ubercart order product source.
+ *
  * @MigrateSource(
- *   id = "d6_ubercart_order_product"
+ *   id = "d6_ubercart_order_product",
+ *   source_provider = "uc_order"
  * )
  */
 class OrderProduct extends SqlBase {
@@ -17,7 +20,15 @@ class OrderProduct extends SqlBase {
    */
   public function query() {
     $query = $this->select('uc_order_products', 'uop')
-      ->fields('uop', ['order_product_id', 'order_id', 'nid', 'title', 'qty', 'price', 'data']);
+      ->fields('uop', [
+        'order_product_id',
+        'order_id',
+        'nid',
+        'title',
+        'qty',
+        'price',
+        'data',
+      ]);
     $query->innerJoin('uc_orders', 'uo', 'uop.order_id = uo.order_id');
     $query->fields('uo', ['created', 'modified', 'currency']);
 
diff --git a/src/Plugin/migrate/source/ubercart/d6/Product.php b/modules/ubercart/src/Plugin/migrate/source/d6/Product.php
similarity index 91%
rename from src/Plugin/migrate/source/ubercart/d6/Product.php
rename to modules/ubercart/src/Plugin/migrate/source/d6/Product.php
index f94da24..5488bce 100644
--- a/src/Plugin/migrate/source/ubercart/d6/Product.php
+++ b/modules/ubercart/src/Plugin/migrate/source/d6/Product.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\ubercart\d6;
+namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6;
 
-use Drupal\Core\State\StateInterface;
-use Drupal\migrate\MigrateException;
 use Drupal\migrate\Plugin\migrate\source\SqlBase;
-use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Row;
 
 /**
+ * Drupal 6 ubercart product source.
+ *
  * @MigrateSource(
- *   id = "d6_ubercart_product"
+ *   id = "d6_ubercart_product",
+ *   source_provider = "uc_product"
  * )
  */
 class Product extends SqlBase {
diff --git a/src/Plugin/migrate/source/ubercart/d6/ProductVariation.php b/modules/ubercart/src/Plugin/migrate/source/d6/ProductVariation.php
similarity index 89%
rename from src/Plugin/migrate/source/ubercart/d6/ProductVariation.php
rename to modules/ubercart/src/Plugin/migrate/source/d6/ProductVariation.php
index ef867c4..6b214f0 100644
--- a/src/Plugin/migrate/source/ubercart/d6/ProductVariation.php
+++ b/modules/ubercart/src/Plugin/migrate/source/d6/ProductVariation.php
@@ -1,13 +1,16 @@
 <?php
 
-namespace Drupal\commerce_migrate\Plugin\migrate\source\ubercart\d6;
+namespace Drupal\commerce_migrate_ubercart\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
 /**
+ * Drupal 6 ubercart product variation sourcee.
+ *
  * @MigrateSource(
- *   id = "d6_ubercart_product_variation"
+ *   id = "d6_ubercart_product_variation",
+ *   source_provider = "uc_product"
  * )
  */
 class ProductVariation extends DrupalSqlBase {
diff --git a/tests/fixtures/uc6.php b/modules/ubercart/tests/fixtures/uc6.php
similarity index 100%
rename from tests/fixtures/uc6.php
rename to modules/ubercart/tests/fixtures/uc6.php
diff --git a/tests/fixtures/uc7.php b/modules/ubercart/tests/fixtures/uc7.php
similarity index 100%
rename from tests/fixtures/uc7.php
rename to modules/ubercart/tests/fixtures/uc7.php
diff --git a/tests/src/Kernel/d6/Ubercart/CurrencyTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/CurrencyTest.php
similarity index 83%
copy from tests/src/Kernel/d6/Ubercart/CurrencyTest.php
copy to modules/ubercart/tests/src/Kernel/Migrate/d6/CurrencyTest.php
index fd7c9fe..30664e0 100644
--- a/tests/src/Kernel/d6/Ubercart/CurrencyTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/CurrencyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
@@ -8,6 +8,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * Tests currency migration.
  *
  * @group commerce_migrate
+ * @group commerce_migrate_ubercart6
  */
 class CurrencyTest extends Ubercart6TestBase {
 
diff --git a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php
index 0b36a29..a150238 100644
--- a/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/MigrateProfileBillingTest.php
@@ -4,12 +4,12 @@ namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\profile\Entity\Profile;
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
-use Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart\Ubercart6TestBase;
 
 /**
  * Tests billing profile migration.
  *
- * @group commerce_migrate_ubercart
+ * @group commerce_migrate
+ * @group commerce_migrate_ubercart6
  */
 class MigrateProfileBillingTest extends Ubercart6TestBase {
 
diff --git a/tests/src/Kernel/d6/Ubercart/OrderItemTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderItemTest.php
similarity index 94%
rename from tests/src/Kernel/d6/Ubercart/OrderItemTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/OrderItemTest.php
index 546d1af..1109408 100644
--- a/tests/src/Kernel/d6/Ubercart/OrderItemTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderItemTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\commerce_order\Entity\OrderItem;
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
@@ -9,6 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * Tests order item migration.
  *
  * @group commerce_migrate
+ * @group commerce_migrate_ubercart6
  */
 class OrderItemTest extends Ubercart6TestBase {
 
diff --git a/tests/src/Kernel/d6/Ubercart/OrderTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderTest.php
similarity index 92%
rename from tests/src/Kernel/d6/Ubercart/OrderTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/OrderTest.php
index 1eb740a..0aaf552 100644
--- a/tests/src/Kernel/d6/Ubercart/OrderTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/OrderTest.php
@@ -1,14 +1,15 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\commerce_order\Entity\Order;
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
 /**
- * Tests billing profile migration.
+ * Tests order migration.
  *
  * @group commerce_migrate
+ * @group commerce_migrate_ubercart6
  */
 class OrderTest extends Ubercart6TestBase {
 
@@ -22,7 +23,6 @@ class OrderTest extends Ubercart6TestBase {
   public static $modules = [
     'path',
     'commerce_product',
-    'commerce_migrate_ubercart',
   ];
 
   /**
diff --git a/tests/src/Kernel/d6/Ubercart/ProductTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductTest.php
similarity index 93%
rename from tests/src/Kernel/d6/Ubercart/ProductTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/ProductTest.php
index ff0d8e4..d9597b2 100644
--- a/tests/src/Kernel/d6/Ubercart/ProductTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
@@ -8,6 +8,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * Tests Product migration.
  *
  * @group commerce_migrate
+ * @group commerce_migrate_ubercart6
  */
 class ProductTest extends Ubercart6TestBase {
 
@@ -55,4 +56,3 @@ class ProductTest extends Ubercart6TestBase {
   }
 
 }
-
diff --git a/tests/src/Kernel/d6/Ubercart/ProductVariationTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductVariationTest.php
similarity index 93%
rename from tests/src/Kernel/d6/Ubercart/ProductVariationTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/ProductVariationTest.php
index f6ed749..81acde1 100644
--- a/tests/src/Kernel/d6/Ubercart/ProductVariationTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/ProductVariationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
@@ -8,6 +8,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * Tests Product migration.
  *
  * @group commerce_migrate
+ * @group commerce_migrate_ubercart6
  */
 class ProductVariationTest extends Ubercart6TestBase {
 
diff --git a/tests/src/Kernel/d6/Ubercart/StoreTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/StoreTest.php
similarity index 89%
rename from tests/src/Kernel/d6/Ubercart/StoreTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/StoreTest.php
index f03c0c0..ca168db 100644
--- a/tests/src/Kernel/d6/Ubercart/StoreTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/StoreTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\commerce_store\Entity\Store;
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
@@ -9,6 +9,7 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * Tests store migration.
  *
  * @group commerce_migrate
+ * @group commerce_migrate_ubercart6
  */
 class StoreTest extends Ubercart6TestBase {
 
diff --git a/tests/src/Kernel/d6/Ubercart/Ubercart6TestBase.php b/modules/ubercart/tests/src/Kernel/Migrate/d6/Ubercart6TestBase.php
similarity index 85%
rename from tests/src/Kernel/d6/Ubercart/Ubercart6TestBase.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d6/Ubercart6TestBase.php
index e6d1206..dc492da 100644
--- a/tests/src/Kernel/d6/Ubercart/Ubercart6TestBase.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d6/Ubercart6TestBase.php
@@ -1,9 +1,12 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d6;
 
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
+/**
+ * Test base for Ubercart D6 tests.
+ */
 abstract class Ubercart6TestBase extends MigrateDrupal6TestBase {
 
   /**
@@ -26,10 +29,11 @@ abstract class Ubercart6TestBase extends MigrateDrupal6TestBase {
     'state_machine',
     'text',
     'views',
+    'commerce_migrate_ubercart',
   ];
 
   /**
-   * @inheritDoc
+   * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
diff --git a/tests/src/Kernel/d6/Ubercart/CurrencyTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/CurrencyTest.php
similarity index 57%
rename from tests/src/Kernel/d6/Ubercart/CurrencyTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d7/CurrencyTest.php
index fd7c9fe..6431332 100644
--- a/tests/src/Kernel/d6/Ubercart/CurrencyTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/CurrencyTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d6\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d7;
 
 use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
 
@@ -8,8 +8,9 @@ use Drupal\Tests\commerce_migrate\Kernel\CommerceMigrateTestTrait;
  * Tests currency migration.
  *
  * @group commerce_migrate
+ * @group commerce_migrate_ubercart7
  */
-class CurrencyTest extends Ubercart6TestBase {
+class CurrencyTest extends Ubercart7TestBase {
 
   use CommerceMigrateTestTrait;
 
@@ -22,10 +23,10 @@ class CurrencyTest extends Ubercart6TestBase {
   }
 
   /**
-   * Test currency migration from Drupal 6 to 8.
+   * Test currency migration from Drupal 7 to 8.
    */
   public function testCurrency() {
-    $this->assertCurrencyEntity('NZD', 'NZD', 'New Zealand Dollar', '554', 2, '$');
+    $this->assertCurrencyEntity('USD', 'USD', 'US Dollar', '840', 2, '$');
   }
 
 }
diff --git a/tests/src/Kernel/d7/Ubercart/StoreTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/StoreTest.php
similarity index 90%
rename from tests/src/Kernel/d7/Ubercart/StoreTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d7/StoreTest.php
index a52de1a..9feaa26 100644
--- a/tests/src/Kernel/d7/Ubercart/StoreTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/StoreTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d7;
 
 use Drupal\address\Plugin\Field\FieldType\AddressItem;
 use Drupal\commerce_store\Entity\Store;
@@ -9,17 +9,11 @@ use Drupal\commerce_store\Entity\Store;
  * Tests store migration.
  *
  * @group commerce_migrate
+ * @group commerce_migrate_ubercart7
  */
 class StoreTest extends Ubercart7TestBase {
 
   /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['commerce_store'];
-
-  /**
    * {@inheritdoc}
    */
   protected function setUp() {
@@ -30,7 +24,7 @@ class StoreTest extends Ubercart7TestBase {
       'd7_user_role',
       'd7_user',
       'ubercart_currency',
-      'd7_ubercart_store'
+      'd7_ubercart_store',
     ]);
   }
 
diff --git a/tests/src/Kernel/d7/Ubercart/Ubercart7FixtureTest.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7FixtureTest.php
similarity index 89%
rename from tests/src/Kernel/d7/Ubercart/Ubercart7FixtureTest.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7FixtureTest.php
index 789c2a6..22d2a77 100644
--- a/tests/src/Kernel/d7/Ubercart/Ubercart7FixtureTest.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7FixtureTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d7;
 
 use Drupal\user\Entity\User;
 
diff --git a/tests/src/Kernel/d7/Ubercart/Ubercart7TestBase.php b/modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7TestBase.php
similarity index 93%
rename from tests/src/Kernel/d7/Ubercart/Ubercart7TestBase.php
rename to modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7TestBase.php
index 46bc814..4302aa3 100644
--- a/tests/src/Kernel/d7/Ubercart/Ubercart7TestBase.php
+++ b/modules/ubercart/tests/src/Kernel/Migrate/d7/Ubercart7TestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Ubercart;
+namespace Drupal\Tests\commerce_migrate_ubercart\Kernel\Migrate\d7;
 
 use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase;
 
@@ -29,6 +29,8 @@ abstract class Ubercart7TestBase extends MigrateDrupal7TestBase {
     'state_machine',
     'text',
     'views',
+    'commerce_migrate_ubercart',
+    'telephone',
   ];
 
   /**
diff --git a/tests/src/Kernel/d7/Ubercart/CurrencyTest.php b/tests/src/Kernel/d7/Ubercart/CurrencyTest.php
deleted file mode 100644
index ecfcb33..0000000
--- a/tests/src/Kernel/d7/Ubercart/CurrencyTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Drupal\Tests\commerce_migrate\Kernel\d7\Ubercart;
-
-use Drupal\commerce_price\Entity\Currency;
-use Drupal\commerce_price\Entity\CurrencyInterface;
-
-/**
- * Tests currency migration.
- *
- * @group commerce_migrate
- */
-class CurrencyTest extends Ubercart7TestBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function setUp() {
-    parent::setUp();
-    $this->executeMigration('ubercart_currency');
-  }
-
-  /**
-   * Test currency migration from Drupal 7 to 8.
-   */
-  public function testCurrency() {
-    /** @var \Drupal\commerce_price\Entity\CurrencyInterface $currency */
-    $this->assertCurrencyEntity('USD', 'USD', 'US Dollar', '840', 2, '$');
-  }
-
-  /**
-   * @param string $id
-   *   The currency id.
-   * @param $expected_currency_code
-   * @param $expected_name
-   * @param $expected_numeric_code
-   * @param $expected_fraction_digits
-   * @param $expected_symbol
-   */
-  public function assertCurrencyEntity($id, $expected_currency_code, $expected_name, $expected_numeric_code, $expected_fraction_digits, $expected_symbol) {
-    /** @var \Drupal\commerce_price\Entity\CurrencyInterface $currency */
-    $currency = Currency::load($id);
-    $this->assertInstanceOf(CurrencyInterface::class, $currency);
-    $this->assertSame($expected_currency_code, $currency->getCurrencyCode());
-    $this->assertSame($expected_name, $currency->getName());
-    $this->assertSame($expected_fraction_digits, $currency->getFractionDigits());
-    $this->assertSame($expected_numeric_code, $currency->getNumericCode());
-    $this->assertSame($expected_symbol, $currency->getSymbol());
-  }
-
-}