diff --git a/.github/workflows/analyse.yml b/.github/workflows/analyse.yml
index f8a0fe8..333ffff 100644
--- a/.github/workflows/analyse.yml
+++ b/.github/workflows/analyse.yml
@@ -10,11 +10,9 @@ jobs:
             matrix:
                 os: [ubuntu-latest]
                 php: [8.3]
-                laravel: [10.*, 11.*]
+                laravel: [11.*]
                 stability: [prefer-stable]
                 include:
-                    - laravel: 10.*
-                      testbench: 8.*
                     - laravel: 11.*
                       testbench: 9.*
 
diff --git a/generate-changelog.yml b/.github/workflows/changelog.yml
similarity index 98%
rename from generate-changelog.yml
rename to .github/workflows/changelog.yml
index aca737e..161eadb 100644
--- a/generate-changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -5,7 +5,7 @@ on:
     types: [ published, edited, deleted ]
 
 jobs:
-  update:
+  generate:
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index c85cbf7..0d9d3b0 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -10,11 +10,9 @@ jobs:
             matrix:
                 os: [ubuntu-latest]
                 php: [8.3]
-                laravel: [10.*, 11.*]
+                laravel: [11.*]
                 stability: [prefer-stable]
                 include:
-                    - laravel: 10.*
-                      testbench: 8.*
                     - laravel: 11.*
                       testbench: 9.*
 
diff --git a/.github/workflows/generate-changelog.yml b/.github/workflows/generate-changelog.yml
deleted file mode 100644
index 49a863e..0000000
--- a/.github/workflows/generate-changelog.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: "Update Changelog"
-
-on:
-    release:
-        types: [ published, edited, deleted ]
-
-jobs:
-    update:
-        runs-on: ubuntu-latest
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v3
-              with:
-                  ref: ${{ github.event.release.target_commitish }}
-
-            - name: Generate changelog
-              uses: justbetter/generate-changelogs-action@main
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              with:
-                  repository: ${{ github.repository }}
-
-            - name: Commit CHANGELOG
-              uses: stefanzweifel/git-auto-commit-action@v4
-              with:
-                  branch: ${{ github.event.release.target_commitish }}
-                  commit_message: Update CHANGELOG
-                  file_pattern: CHANGELOG.md
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index bf6eb0c..c502770 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,12 +9,10 @@ jobs:
             fail-fast: true
             matrix:
                 os: [ubuntu-latest]
-                php: [8.1, 8.2, 8.3]
-                laravel: [10.*, 11.*]
-                stability: [prefer-lowest, prefer-stable]
+                php: [8.2, 8.3]
+                laravel: [11.*]
+                stability: [prefer-stable]
                 include:
-                    - laravel: 10.*
-                      testbench: 8.*
                     - laravel: 11.*
                       testbench: 9.*
                 exclude:
diff --git a/README.md b/README.md
index cb406a7..e8a1fb4 100644
--- a/README.md
+++ b/README.md
@@ -22,8 +22,8 @@ This package can:
 - Only update prices in Magento when are modified. i.e. when you retrieve the same price ten times it only updates once to Magento
 - Search for missing prices in Magento
 - Automatically stop syncing when updating fails
+- Supports Magento 2 async bulk requests for updating using [Laravel Magento Async](https://github.com/justbetter/laravel-magento-async)
 - Logs activities using [Spatie activitylog](https://github.com/spatie/laravel-activitylog)
-- Logs errors using [JustBetter Error Logger](https://github.com/justbetter/laravel-error-logger)
 - Checks if Magento products exist using [JustBetter Magento Products](https://github.com/justbetter/laravel-magento-products)
 
 > Also using customer specific prices? [See our other package!](https://github.com/justbetter/laravel-magento-customer-prices)
@@ -33,23 +33,13 @@ This package can:
 
 Require this package: `composer require justbetter/laravel-magento-prices`
 
-Publish the config:
-```
-php artisan vendor:publish --provider="JustBetter\MagentoPrices\ServiceProvider" --tag="config"
-```
-
-Publish the activity log's migrations:
-```
-php artisan vendor:publish --provider="Spatie\Activitylog\ActivitylogServiceProvider" --tag="activitylog-migrations"
-```
+Publish the config: `php artisan vendor:publish --provider="JustBetter\MagentoPrices\ServiceProvider" --tag="config"`
 
-Publish the batches table migration:
-```
-php artisan queue:batches-table
-```
+Publish the activity log's migrations: `php artisan vendor:publish --provider="Spatie\Activitylog\ActivitylogServiceProvider" --tag="activitylog-migrations"`
 
-Run migrations.
+Run migrations. `php artisan migrate`
 
+> **_TIP:_** All actions in this package are run via jobs, we recommend Laravel Horizon or another queueing system to run these
 
 ### Laravel Nova
 
@@ -58,116 +48,145 @@ We have a [Laravel Nova integration](https://github.com/justbetter/laravel-magen
 ## Usage
 
 Add the following commands to your scheduler:
+
 ```php
 <?php
 
     protected function schedule(Schedule $schedule): void
     {
-        $schedule->command(\JustBetter\MagentoPrices\Commands\SyncPricesCommand::class)->everyMinute();
+        $schedule->command(\JustBetter\MagentoPrices\Commands\ProcessPricesCommand::class)->everyMinute();
 
-        $schedule->command(\JustBetter\MagentoPrices\Commands\RetrievePricesCommand::class)->daily();
-        // Or for example
-        $schedule->command(\JustBetter\MagentoPrices\Commands\RetrievePricesCommand::class)->weekly(); // Retrieve all weekly
-        $schedule->command('price:retrieve --date=today')->dailyAt('23:00'); // Retrieve updated daily
+        $schedule->command(\JustBetter\MagentoPrices\Commands\Retrieval\RetrieveAllPricesCommand::class)->daily();
+        $schedule->command(\JustBetter\MagentoPrices\Commands\Retrieval\RetrieveAllPricesCommand::class, ['from' => 'now -2 hours'])->hourly(); // Retrieve updated
     }
 
 ```
 
-
 ### Retrieving Prices
 
-In order to retrieve prices you have to create two classes. One to retrieve skus and one to retrieve the price(s) per sku.
+This package works with a repository that retrieves prices per SKU which you have to implement.
 
-#### Price retriever
+#### Repository
 
-This class is responsible for retrieving prices for products. Your class must extend `\JustBetter\MagentoPrices\Retriever\PriceRetriever`.
-Your class must return a `PriceData` object or `null`.
-The `PriceData` object is a wrapper around three collections:
-- Base prices
-- Tier prices
-- Special Prices
+This class is responsible for retrieving prices for products, retrieving sku's and settings.
+Your class must extend `\JustBetter\MagentoPrices\Repository\Repository` and implement the `retrieve` method.
+If there is no price for the SKU you may return `null`. In all other cases you need to return a `PriceData` object which contains four elements:
+- `sku` Required
+- `base_prices` Optional, array of base prices
+- `tier_prices` Optional, array of tier prices
+- `special_prices` Optional, array of special prices
 
-See the classes `BasePriceData` and `TierPriceData` in the `JustBetter\MagentoPrices\Data` namespace on how to use them.
+The formats of the price arrays follows Magento's API.
+You can view the rules in the `PriceData` class to get an idea of what you need to provide.
 
-For example:
+##### Example
 
 ```php
+
 <?php
 
-namespace JustBetter\MagentoPrices\Retriever;
+namespace App\Integrations\MagentoPrices;
 
-use JustBetter\MagentoPrices\Data\BasePriceData;
 use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Data\SpecialPriceData;
-use JustBetter\MagentoPrices\Data\TierPriceData;
-use JustBetter\MagentoPrices\Helpers\MoneyHelper;
+use JustBetter\MagentoPrices\Repository\Repository;
 
-class ExamplePriceRetriever extends PriceRetriever
+class MyPriceRepository extends Repository
 {
-    public function __construct(protected ExternalService $externalService, protected MoneyHelper $moneyHelper) {}
-
-    public function retrieve(string $sku): ?PriceData
+  public function retrieve(string $sku): ?PriceData
     {
-        $basePrice = new BasePriceData(
-            $this->moneyHelper->getMoney($this->externalService->getBasePrice($sku))
-        );
-
-        $tierPrices = $this->externalService->getTierPrices($sku)
-            ->mapInto(TierPriceData::class);
-
-        $specialPrices = $this->externalService->getSpecialPrices($sku)
-            ->mapInto(SpecialPriceData::class);
-
-        return new PriceData($sku, collect([$basePrice]), $tierPrices, $specialPrices);
+        return PriceData::of([
+            'sku' => $sku,
+            'base_prices' => [
+                [
+                    'store_id' => 0,
+                    'price' => 10,
+                ],
+                [
+                    'store_id' => 2,
+                    'price' => 19,
+                ],
+            ],
+            'tier_prices' => [
+                [
+                    'website_id' => 0,
+                    'customer_group' => 'group_1',
+                    'price_type' => 'fixed',
+                    'quantity' => 1,
+                    'price' => 8,
+                ],
+                [
+                    'website_id' => 0,
+                    'customer_group' => '4040',
+                    'price_type' => 'group_2',
+                    'quantity' => 1,
+                    'price' => 7,
+                ],
+            ],
+            'special_prices' => [
+                [
+                    'store_id' => 0,
+                    'price' => 5,
+                    'price_from' => now()->subWeek()->toDateString(),
+                    'price_to' => now()->addWeek()->toDateString(),
+                ],
+            ],
+        ]);
     }
 }
 ```
 
-Then register your retriever in the config file `config/magento-prices.php`:
+### Retrieving SKU's
+
+By default, the `Repository` that you are extending will retrieve the SKU's from [justbetter/laravel-magento-products](https://github.com/justbetter/laravel-magento-products).
+If you wish to use this you have to add the commands to your scheduler to automatically import products.
+
+If you have another source for your SKU's you may implement the `skus` method yourself.
+It accepts an optional carbon instance to only retrieve modified stock.
 
 ```php
 <?php
 
-return [
-    'retrievers' => [
-        'price' => ExamplePriceRetriever::class,
-    ],
-```
-
-You can retrieve the price by running: `php artisan price:retrieve {sku}`
+namespace App\Integrations\MagentoPrices;
 
-##### Storing Money
+use JustBetter\MagentoPrices\Repositories\Repository;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
 
-We use Brick/money for storing prices, to create a price use:
-```php
- $basePrice = new BasePriceData(
-            Money::of(10, config('laravel-magento-prices.currency'))
-        );
+class MyPriceRepository implements Repository
+{
+    public function skus(?Carbon $from = null): ?Collection
+    {
+        return collect(['sku_1', 'sku_2']);
+    }
+}
 ```
 
-There is a helper for that which adds precision, context and the rounding mode from the config: `JustBetter\MagentoPrices\Helpers\MoneyHelper`
-
-##### Example
-
-To help you get started you can look at the `\JustBetter\MagentoPrices\Retriever\DummyPriceRetriever`
+### Configuring the repository
 
-#### SKU Retriever
+The repository class has a couple of settings that you can adjust:
 
-In order to know what SKU's to retrieve prices for you have to create a SKU retriever class. This class must extend `\JustBetter\MagentoPrices\Retriever\SkuRetriever`.
+```php
+class BaseRepository
+{
+    // How many prices may be retrieved at once when the process job runs
+    protected int $retrieveLimit = 250;
 
-It is required to have a method that retrieves all skus. You can optionally implement the `retrieveByDate` method to retrieve updated skus.
+    // How many prices may be updated at once when the process job runs
+    protected int $updateLimit = 250;
 
-And example can be found in `\JustBetter\MagentoPrices\Retriever\DummySkuRetriever`
+    // How many times an update to Magento may fail before it stops trying
+    protected int $failLimit = 3;
+}
+```
 
-Don't forget to register your retriever in the config file `config/magento-prices.php`:
+After you've created and configured the repository you have to set it in your configuration file:
 
 ```php
 <?php
 
 return [
-    'retrievers' => [
-        'sku' => MyAwewsomeSkuRetriever::class,
-    ],
+    'repository' => \App\Integrations\MagentoPrices\MyPriceRepository::class,
+];
 ```
 
 ### Checking for missing prices
@@ -175,70 +194,24 @@ return [
 There is a build in action that checks all products in Magento where there is no price or the price is zero.
 For each product it will automatically start an update or retrieve.
 
-You can run this with the command: `php artisan price:missing`
-
-
-### Syncing
-
-The `php artisan price:sync` command will check the `retrieve` and `update` flags and dispatch jobs to retrieve/update the prices.
-In order to not overload your price source or Magento you can set limits in the config file.
-```php
-<?php
-
-return [
-    /* How many price retrieval jobs may be dispatched per sync */
-    'retrieve_limit' => 25,
-
-    /* How many prices update jobs may be dispatched per sync */
-    'update_limit' => 100,
-];
-```
-
-#### Long Waits
-
-The sync limits the amount of products that are retrieved/updated each sync.
-This may result in long waits if not properly configured for the amount of updates you get.
-
-To detect this you can add the `\JustBetter\MagentoPrices\Commands\MonitorWaitTimesCommand` to your schedule.
-This will fire the `\JustBetter\MagentoPrices\Events\LongWaitDetectedEvent` event in which you can for example trigger more updates or send a notification.
-
-You can configure the limits of when the event will be fired in the config:
-```php
-<?php
-
-return [
-    'monitor' => [
-        /* Max wait time in minutes, if exceeded the LongWaitDetected event is dispatched */
-        'retrieval_max_wait' => 30,
-
-        /* Max wait time in minutes, if exceeded the LongWaitDetected event is dispatched */
-        'update_max_wait' => 30,
-    ]
-];
-```
+You can run this with the command: `php artisan magento-prices:process-missing-prices`
 
 ### Handling failures
 
 When an update fails it will try again. A fail counter is stored with the model which is increased at each failure.
-A common failure is a missing required attribute in Magento.
-
-In the config you can specify how many times the update may be attempted:
-```php
-<?php
-
-return [
-    /* How many times can a price update failed before being cancelled */
-    'fail_count' => 5,
-];
-```
-> *Note* This applies to all three types of updates. Base, tier and special.
+In the repository you can specify how many times the update may be attempted
 
 ### Events
 
 Events that are dispatched by this package are:
-- [`\JustBetter\MagentoPrices\Events\LongWaitDetectedEvent`](#long-waits)
 - `\JustBetter\MagentoPrices\Events\UpdatedPriceEvent` - Triggered when a price is updated
 
+### Async bulk
+
+In order to drastically decrease the amount of requests to Magento you can enable the `async` option in the configuration file.
+This will use [Laravel Magento Async](https://github.com/justbetter/laravel-magento-async) to send the update requets.
+Do not forget to follow the installation guide on that package.
+
 ## Quality
 
 To ensure the quality of this package, run the following command:
diff --git a/UPGRADE.md b/UPGRADE.md
new file mode 100644
index 0000000..77ae19b
--- /dev/null
+++ b/UPGRADE.md
@@ -0,0 +1,21 @@
+# Upgrade Guide
+
+## 1.x to 2.x
+
+2.x introduces a complete refactor of the package structure.
+
+A few highlights:
+- Simplified implementation
+- Support updating via Magento 2 bulk async requests
+- Removed error logger, replaced with activity log
+- Dropped support for Laravel 10
+
+### Update your project
+
+The price retriever and SKU retriever classes all have been merged into a single repository class.
+Refer to the readme on how to implement this.
+
+The configuration file has been stripped, most of the configuration is now done in the repository class.
+
+A lot of classes have been renamed, be sure to update your scheduler and check all classes that you use.
+The price model has been renamed from `MagentoPrice` to `Price`.
diff --git a/composer.json b/composer.json
index 2b967dc..9cf2075 100644
--- a/composer.json
+++ b/composer.json
@@ -4,20 +4,20 @@
   "type": "package",
   "license": "MIT",
   "require": {
-    "php": "^8.1",
-    "brick/money": "^0.7|^0.8",
+    "php": "^8.2",
     "justbetter/laravel-magento-client": "^2.4",
     "justbetter/laravel-magento-products": "^1.4",
-    "laravel/framework": "^10.0|^11.0",
+    "justbetter/laravel-magento-async": "^1.0",
+    "laravel/framework": "^11.0",
     "spatie/laravel-activitylog": "^4.8"
   },
   "require-dev": {
     "doctrine/dbal": "^3.6",
     "larastan/larastan": "^2.9",
-    "laravel/pint": "^1.6",
-    "orchestra/testbench": "^8.0|^9.0",
+    "laravel/pint": "^1.17",
+    "orchestra/testbench": "^9.0",
     "phpstan/phpstan-mockery": "^1.1",
-    "phpunit/phpunit": "^10.0"
+    "phpunit/phpunit": "^10.5"
   },
   "authors": [
     {
diff --git a/config/magento-prices.php b/config/magento-prices.php
index 762f458..45fcb80 100644
--- a/config/magento-prices.php
+++ b/config/magento-prices.php
@@ -1,40 +1,11 @@
 <?php
 
-use Brick\Math\RoundingMode;
-use JustBetter\MagentoPrices\Retriever\DummyPriceRetriever;
-use JustBetter\MagentoPrices\Retriever\DummySkuRetriever;
-
 return [
-    /* Register your price and sku retrievers here */
-    'retrievers' => [
-        'sku' => DummySkuRetriever::class,
-        'price' => DummyPriceRetriever::class,
-    ],
-
-    'currency' => 'EUR',
-    'precision' => 4,
-    'rounding_mode' => RoundingMode::HALF_UP,
-
-    /* How many times can a price update failed before being cancelled */
-    'fail_count' => 5,
-
-    /* How many price retrieval jobs may be dispatched per sync */
-    'retrieve_limit' => 25,
-
-    /* How many prices update jobs may be dispatched per sync */
-    'update_limit' => 100,
+    'repository' => \JustBetter\MagentoPrices\Repository\Repository::class,
 
     /* Queue for the jobs to run on */
     'queue' => 'default',
 
-    'monitor' => [
-        /* Max wait time in minutes, if exceeded the LongWaitDetected event is dispatched */
-        'retrieval_max_wait' => 30,
-
-        /* Max wait time in minutes, if exceeded the LongWaitDetected event is dispatched */
-        'update_max_wait' => 30,
-    ],
-
-    /* Send stock updates using Magento 2's async endpoints, a configured message queue in Magento is required for this */
+    /* Send updates using Magento 2's async bulk endpoints, a configured message queue in Magento is required for this */
     'async' => false,
 ];
diff --git a/database/migrations/2024_07_26_163000_magento_prices_add_checksum_column.php b/database/migrations/2024_07_26_163000_magento_prices_add_checksum_column.php
new file mode 100644
index 0000000..bf912dc
--- /dev/null
+++ b/database/migrations/2024_07_26_163000_magento_prices_add_checksum_column.php
@@ -0,0 +1,20 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('magento_prices', function (Blueprint $table): void {
+            $table->string('checksum')->nullable()->after('update');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropColumns('magento_prices', ['checksum']);
+    }
+};
diff --git a/database/migrations/2024_07_30_153000_magento_prices_drop_unused_columns.php b/database/migrations/2024_07_30_153000_magento_prices_drop_unused_columns.php
new file mode 100644
index 0000000..a62392a
--- /dev/null
+++ b/database/migrations/2024_07_30_153000_magento_prices_drop_unused_columns.php
@@ -0,0 +1,20 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::dropColumns('magento_prices', ['has_tier']);
+    }
+
+    public function down(): void
+    {
+        Schema::table('magento_prices', function (Blueprint $table): void {
+            $table->boolean('has_tier')->default(false)->after('tier_prices');
+        });
+    }
+};
diff --git a/phpstan.neon b/phpstan.neon
index 2c82c41..53ccd28 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -6,9 +6,7 @@ parameters:
     paths:
         - src
         - tests
-    level: 6
-    checkMissingIterableValueType: false
-    checkGenericClassInNonGenericObjectType: false
+    level: 8
     ignoreErrors:
-        - '#Unable to resolve the template type TKey in call to function collect#'
-        - '#Unable to resolve the template type TValue in call to function collect#'
+        - identifier: missingType.iterableValue
+        - identifier: missingType.generics
diff --git a/src/Actions/CheckTierDuplicates.php b/src/Actions/CheckTierDuplicates.php
deleted file mode 100644
index 77a8a75..0000000
--- a/src/Actions/CheckTierDuplicates.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Actions;
-
-use Illuminate\Support\Collection;
-use JustBetter\MagentoPrices\Contracts\ChecksTierDuplicates;
-use JustBetter\MagentoPrices\Data\TierPriceData;
-use JustBetter\MagentoPrices\Exceptions\DuplicateTierPriceException;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-use Spatie\Activitylog\ActivityLogger;
-
-/**
- * Check if the tier prices have duplicates.
- * When this is the case, Magento will always reject the update.
- */
-class CheckTierDuplicates implements ChecksTierDuplicates
-{
-    public function check(string $sku, Collection $tierPrices): void
-    {
-        /** @var TierPriceData $tierPrice */
-        foreach ($tierPrices as $tierPrice) {
-            $matching = $tierPrices
-                ->where('storeId', $tierPrice->storeId)
-                ->where('quantity', $tierPrice->quantity)
-                ->where('groupId', $tierPrice->groupId);
-
-            if ($matching->count() == 1) {
-                continue;
-            }
-
-            /** @var ?MagentoPrice $model */
-            $model = MagentoPrice::query()->firstWhere('sku', '=', $sku);
-
-            activity()
-                ->when($model !== null, fn (ActivityLogger $logger) => $logger->on($model))
-                ->useLog('error')
-                ->withProperties([
-                    'sku' => $sku,
-                    'duplicate' => $matching->toArray(),
-                ])
-                ->log("Duplicate tier prices found for $sku");
-
-            throw new DuplicateTierPriceException($sku, $matching);
-        }
-    }
-
-    public static function bind(): void
-    {
-        app()->singleton(ChecksTierDuplicates::class, static::class);
-    }
-}
diff --git a/src/Actions/DeterminePricesEqual.php b/src/Actions/DeterminePricesEqual.php
deleted file mode 100644
index 7e5d882..0000000
--- a/src/Actions/DeterminePricesEqual.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Actions;
-
-use Illuminate\Support\Collection;
-use JustBetter\MagentoPrices\Contracts\DeterminesPricesEqual;
-use JustBetter\MagentoPrices\Data\BasePriceData;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Data\SpecialPriceData;
-use JustBetter\MagentoPrices\Data\TierPriceData;
-
-class DeterminePricesEqual implements DeterminesPricesEqual
-{
-    public function equals(PriceData $a, PriceData $b): bool
-    {
-        if (! $this->basePricesEqual($a->basePrices, $b->basePrices)) {
-            return false;
-        }
-
-        if (! $this->tierPricesEqual($a->tierPrices, $b->tierPrices)) {
-            return false;
-        }
-
-        if (! $this->specialPriceEqual($a->specialPrices, $b->specialPrices)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    protected function basePricesEqual(Collection $a, Collection $b): bool
-    {
-        if ($a->count() !== $b->count()) {
-            return false;
-        }
-
-        /** @var BasePriceData $basePrice */
-        foreach ($a as $basePrice) {
-            /** @var ?BasePriceData $matchingPrice */
-            $matchingPrice = $b->where('storeId', '=', $basePrice->storeId)->first();
-
-            if ($matchingPrice === null) {
-                return false;
-            }
-
-            if (! $basePrice->equals($matchingPrice)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    protected function tierPricesEqual(Collection $a, Collection $b): bool
-    {
-        if ($a->count() !== $b->count()) {
-            return false;
-        }
-
-        /** @var TierPriceData $tierPrice */
-        foreach ($a as $tierPrice) {
-            /** @var ?TierPriceData $matchingPrice */
-            $matchingPrice = $b
-                ->where('groupId', '=', $tierPrice->groupId)
-                ->where('storeId', '=', $tierPrice->storeId)
-                ->where('quantity', '=', $tierPrice->quantity)
-                ->where('priceType', '=', $tierPrice->priceType)
-                ->first();
-
-            if ($matchingPrice === null) {
-                return false;
-            }
-
-            if (! $tierPrice->equals($matchingPrice)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    protected function specialPriceEqual(Collection $a, Collection $b): bool
-    {
-        if ($a->count() !== $b->count()) {
-            return false;
-        }
-
-        /** @var SpecialPriceData $specialPrice */
-        foreach ($a as $specialPrice) {
-            /** @var ?SpecialPriceData $matchingPrice */
-            $matchingPrice = $b
-                ->where('storeId', '=', $specialPrice->storeId)
-                ->first();
-
-            if ($matchingPrice === null) {
-                return false;
-            }
-
-            if (! $specialPrice->equals($matchingPrice)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public static function bind(): void
-    {
-        app()->singleton(DeterminesPricesEqual::class, static::class);
-    }
-}
diff --git a/src/Actions/FindProductsWithMissingPrices.php b/src/Actions/FindProductsWithMissingPrices.php
deleted file mode 100644
index 146c849..0000000
--- a/src/Actions/FindProductsWithMissingPrices.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Actions;
-
-use Illuminate\Support\Enumerable;
-use Illuminate\Support\LazyCollection;
-use JustBetter\MagentoClient\Client\Magento;
-use JustBetter\MagentoClient\Query\SearchCriteria;
-use JustBetter\MagentoPrices\Contracts\FindsProductsWithMissingPrices;
-
-class FindProductsWithMissingPrices implements FindsProductsWithMissingPrices
-{
-    public function __construct(protected Magento $magento)
-    {
-    }
-
-    public function retrieve(): Enumerable
-    {
-        return LazyCollection::make(function () {
-            $searchCriteria = SearchCriteria::make()
-                ->select(['sku', 'price', 'type_id'])
-                ->get();
-
-            $products = $this->magento->lazy('products', $searchCriteria);
-
-            foreach ($products as $product) {
-                if (
-                    (array_key_exists('price', $product) && floatval($product['price']) > 0) ||
-                    (array_key_exists('type_id', $product) && $product['type_id'] != 'simple')
-                ) {
-                    continue;
-                }
-
-                yield $product['sku'];
-            }
-        });
-    }
-
-    public static function bind(): void
-    {
-        app()->singleton(FindsProductsWithMissingPrices::class, static::class);
-    }
-}
diff --git a/src/Actions/MonitorWaitTimes.php b/src/Actions/MonitorWaitTimes.php
deleted file mode 100644
index d4fe23e..0000000
--- a/src/Actions/MonitorWaitTimes.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Actions;
-
-use JustBetter\MagentoPrices\Contracts\MonitorsWaitTimes;
-use JustBetter\MagentoPrices\Events\LongWaitDetectedEvent;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-
-class MonitorWaitTimes implements MonitorsWaitTimes
-{
-    public function monitor(): void
-    {
-        $this->monitorRetrievals();
-        $this->monitorUpdates();
-    }
-
-    protected function monitorRetrievals(): void
-    {
-        $retrievalsPerMinute = config('magento-prices.retrieve_limit');
-        $maxWaitTime = config('magento-prices.monitor.retrieval_max_wait');
-
-        $waitingCount = MagentoPrice::query()
-            ->where('sync', '=', true)
-            ->where('retrieve', '=', true)
-            ->count();
-
-        $wait = $waitingCount / $retrievalsPerMinute;
-
-        if ($wait > $maxWaitTime) {
-            event(new LongWaitDetectedEvent('retrieve', $wait));
-        }
-    }
-
-    protected function monitorUpdates(): void
-    {
-        $retrievalsPerMinute = config('magento-prices.update_limit');
-        $maxWaitTime = config('magento-prices.monitor.update_max_wait');
-
-        $waitingCount = MagentoPrice::query()
-            ->where('sync', '=', true)
-            ->where('update', '=', true)
-            ->count();
-
-        $wait = $waitingCount / $retrievalsPerMinute;
-
-        if ($wait > $maxWaitTime) {
-            event(new LongWaitDetectedEvent('update', $wait));
-        }
-    }
-
-    public static function bind(): void
-    {
-        app()->singleton(MonitorsWaitTimes::class, static::class);
-    }
-}
diff --git a/src/Actions/ProcessPrice.php b/src/Actions/ProcessPrice.php
deleted file mode 100644
index a072c63..0000000
--- a/src/Actions/ProcessPrice.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Actions;
-
-use JustBetter\MagentoPrices\Contracts\ProcessesPrice;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoProducts\Contracts\ChecksMagentoExistence;
-
-class ProcessPrice implements ProcessesPrice
-{
-    public function __construct(
-        protected ChecksMagentoExistence $checksMagentoExistence
-    ) {
-    }
-
-    public function process(PriceData $price, bool $forceUpdate = false): void
-    {
-        $price->validate();
-
-        $priceModel = $price->getModel();
-        $prices = $price;
-
-        $currentPrices = $priceModel->getData();
-
-        $priceModel->base_prices = $prices->basePrices;
-        $priceModel->tier_prices = $prices->tierPrices;
-        $priceModel->special_prices = $prices->specialPrices;
-
-        $priceModel->last_retrieved = now();
-        $priceModel->retrieve = false;
-
-        $priceModel->update = $forceUpdate || ! $currentPrices->equals($price);
-
-        if (! $priceModel->sync && $priceModel->update && $this->checksMagentoExistence->exists($priceModel->sku)) {
-            $priceModel->sync = true;
-        }
-
-        $priceModel->save();
-    }
-
-    public static function bind(): void
-    {
-        app()->singleton(ProcessesPrice::class, static::class);
-    }
-}
diff --git a/src/Actions/ProcessPrices.php b/src/Actions/ProcessPrices.php
new file mode 100644
index 0000000..642ac68
--- /dev/null
+++ b/src/Actions/ProcessPrices.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions;
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Bus\PendingDispatch;
+use JustBetter\MagentoPrices\Contracts\ProcessesPrices;
+use JustBetter\MagentoPrices\Jobs\Retrieval\RetrievePriceJob;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePriceJob;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePricesAsyncJob;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Repository\BaseRepository;
+
+class ProcessPrices implements ProcessesPrices
+{
+    public function process(): void
+    {
+        $repository = BaseRepository::resolve();
+
+        Price::query()
+            ->where('sync', '=', true)
+            ->where('retrieve', '=', true)
+            ->select(['sku'])
+            ->take($repository->retrieveLimit())
+            ->get()
+            ->each(fn (Price $price): PendingDispatch => RetrievePriceJob::dispatch($price->sku));
+
+        if (config('magento-prices.async')) {
+            $prices = Price::query()
+                ->where('sync', '=', true)
+                ->where('update', '=', true)
+                ->whereHas('product', function (Builder $query): void {
+                    $query->where('exists_in_magento', '=', true);
+                })
+                ->select(['id', 'sku'])
+                ->take($repository->updateLimit())
+                ->get();
+
+            UpdatePricesAsyncJob::dispatch($prices);
+        } else {
+            Price::query()
+                ->where('sync', '=', true)
+                ->where('update', '=', true)
+                ->select(['id', 'sku'])
+                ->take($repository->updateLimit())
+                ->get()
+                ->each(fn (Price $price): PendingDispatch => UpdatePriceJob::dispatch($price));
+        }
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(ProcessesPrices::class, static::class);
+    }
+}
diff --git a/src/Actions/Retrieval/RetrieveAllPrices.php b/src/Actions/Retrieval/RetrieveAllPrices.php
new file mode 100644
index 0000000..ec4c860
--- /dev/null
+++ b/src/Actions/Retrieval/RetrieveAllPrices.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Retrieval;
+
+use Illuminate\Foundation\Bus\PendingDispatch;
+use Illuminate\Support\Carbon;
+use JustBetter\MagentoPrices\Contracts\Retrieval\RetrievesAllPrices;
+use JustBetter\MagentoPrices\Jobs\Retrieval\RetrievePriceJob;
+use JustBetter\MagentoPrices\Repository\BaseRepository;
+
+class RetrieveAllPrices implements RetrievesAllPrices
+{
+    public function retrieve(?Carbon $from): void
+    {
+        $repository = BaseRepository::resolve();
+
+        $repository->skus($from)->each(fn (string $sku): PendingDispatch => RetrievePriceJob::dispatch($sku));
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(RetrievesAllPrices::class, static::class);
+    }
+}
diff --git a/src/Actions/Retrieval/RetrievePrice.php b/src/Actions/Retrieval/RetrievePrice.php
new file mode 100644
index 0000000..4f64bd4
--- /dev/null
+++ b/src/Actions/Retrieval/RetrievePrice.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Retrieval;
+
+use JustBetter\MagentoPrices\Contracts\Retrieval\RetrievesPrice;
+use JustBetter\MagentoPrices\Jobs\Retrieval\SavePriceJob;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Repository\BaseRepository;
+
+class RetrievePrice implements RetrievesPrice
+{
+    public function retrieve(string $sku, bool $forceUpdate): void
+    {
+        $repository = BaseRepository::resolve();
+
+        $priceData = $repository->retrieve($sku);
+
+        if ($priceData === null) {
+            Price::query()
+                ->where('sku', '=', $sku)
+                ->update(['retrieve' => false]);
+
+            return;
+        }
+
+        SavePriceJob::dispatch($priceData, $forceUpdate);
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(RetrievesPrice::class, static::class);
+    }
+}
diff --git a/src/Actions/Retrieval/SavePrice.php b/src/Actions/Retrieval/SavePrice.php
new file mode 100644
index 0000000..22d71a4
--- /dev/null
+++ b/src/Actions/Retrieval/SavePrice.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Retrieval;
+
+use JustBetter\MagentoPrices\Contracts\Retrieval\SavesPrice;
+use JustBetter\MagentoPrices\Contracts\Utility\ChecksTierDuplicates;
+use JustBetter\MagentoPrices\Data\PriceData;
+use JustBetter\MagentoPrices\Models\Price;
+
+class SavePrice implements SavesPrice
+{
+    public function __construct(
+        protected ChecksTierDuplicates $tierDuplicates
+    ) {}
+
+    public function save(PriceData $priceData, bool $forceUpdate): void
+    {
+        /** @var Price $model */
+        $model = Price::query()->firstOrNew([
+            'sku' => $priceData['sku'],
+        ]);
+
+        $this->tierDuplicates->check($model, $priceData['tier_prices'] ?? []);
+
+        $model->base_prices = $priceData['base_prices'];
+        $model->tier_prices = $priceData['tier_prices'];
+        $model->special_prices = $priceData['special_prices'];
+
+        $model->sync = true;
+        $model->retrieve = false;
+        $model->last_retrieved = now();
+
+        $model->update = $forceUpdate || $model->checksum !== $priceData->checksum();
+        $model->checksum = $priceData->checksum();
+
+        $model->save();
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(SavesPrice::class, static::class);
+    }
+}
diff --git a/src/Actions/SyncPrices.php b/src/Actions/SyncPrices.php
deleted file mode 100644
index 3a9a6bc..0000000
--- a/src/Actions/SyncPrices.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Actions;
-
-use JustBetter\MagentoPrices\Contracts\SyncsPrices;
-use JustBetter\MagentoPrices\Jobs\RetrievePriceJob;
-use JustBetter\MagentoPrices\Jobs\UpdatePriceJob;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-
-class SyncPrices implements SyncsPrices
-{
-    public function sync(?int $retrieveLimit = null, ?int $updateLimit = null): void
-    {
-        $this->resetDoubleStatus();
-
-        MagentoPrice::shouldRetrieve()
-            ->select(['sku'])
-            ->take($retrieveLimit ?? config('magento-prices.retrieve_limit'))
-            ->get()
-            ->each(fn (MagentoPrice $price) => RetrievePriceJob::dispatch($price->sku));
-
-        MagentoPrice::shouldUpdate()
-            ->take($updateLimit ?? config('magento-prices.update_limit'))
-            ->get()
-            ->each(fn (MagentoPrice $price) => UpdatePriceJob::dispatch($price->sku));
-    }
-
-    protected function resetDoubleStatus(): void
-    {
-        MagentoPrice::query()
-            ->where('retrieve', '=', true)
-            ->where('update', '=', true)
-            ->update(['update' => false]);
-    }
-
-    public static function bind(): void
-    {
-        app()->singleton(SyncsPrices::class, static::class);
-    }
-}
diff --git a/src/Actions/Update/Async/UpdateBasePricesAsync.php b/src/Actions/Update/Async/UpdateBasePricesAsync.php
new file mode 100644
index 0000000..79c1278
--- /dev/null
+++ b/src/Actions/Update/Async/UpdateBasePricesAsync.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Update\Async;
+
+use Illuminate\Support\Collection;
+use JustBetter\MagentoAsync\Client\MagentoAsync;
+use JustBetter\MagentoPrices\Contracts\Update\Async\UpdatesBasePricesAsync;
+use JustBetter\MagentoPrices\Models\Price;
+
+class UpdateBasePricesAsync implements UpdatesBasePricesAsync
+{
+    public function __construct(protected MagentoAsync $magentoAsync) {}
+
+    public function update(Collection $prices): void
+    {
+        $prices = $prices->reject(fn (Price $price): bool => count($price->base_prices ?? []) === 0);
+
+        if ($prices->isEmpty()) {
+            return;
+        }
+
+        $payload = $prices
+            ->map(function (Price $price): array {
+                return [
+                    'prices' => collect($price->base_prices)
+                        ->map(fn (array $basePrice): array => array_merge($basePrice, [
+                            'sku' => $price->sku,
+                        ]))
+                        ->toArray(),
+                ];
+            })
+            ->toArray();
+
+        $this->magentoAsync
+            ->subjects($prices->all())
+            ->postBulk('products/base-prices', $payload);
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(UpdatesBasePricesAsync::class, static::class);
+    }
+}
diff --git a/src/Actions/Update/Async/UpdatePricesAsync.php b/src/Actions/Update/Async/UpdatePricesAsync.php
new file mode 100644
index 0000000..cb4b07c
--- /dev/null
+++ b/src/Actions/Update/Async/UpdatePricesAsync.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Update\Async;
+
+use Illuminate\Support\Collection;
+use JustBetter\MagentoPrices\Contracts\Update\Async\UpdatesBasePricesAsync;
+use JustBetter\MagentoPrices\Contracts\Update\Async\UpdatesPricesAsync;
+use JustBetter\MagentoPrices\Contracts\Update\Async\UpdatesSpecialPricesAsync;
+use JustBetter\MagentoPrices\Contracts\Update\Async\UpdatesTierPricesAsync;
+use JustBetter\MagentoPrices\Models\Price;
+
+class UpdatePricesAsync implements UpdatesPricesAsync
+{
+    public function __construct(
+        protected UpdatesBasePricesAsync $basePrice,
+        protected UpdatesTierPricesAsync $tierPrice,
+        protected UpdatesSpecialPricesAsync $specialPrice,
+    ) {}
+
+    public function update(Collection $prices): void
+    {
+        $this->basePrice->update($prices);
+        $this->tierPrice->update($prices);
+        $this->specialPrice->update($prices);
+
+        $prices->each(fn (Price $price): bool => $price->update(['update' => false]));
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(UpdatesPricesAsync::class, static::class);
+    }
+}
diff --git a/src/Actions/Update/Async/UpdateSpecialPricesAsync.php b/src/Actions/Update/Async/UpdateSpecialPricesAsync.php
new file mode 100644
index 0000000..5bb03b0
--- /dev/null
+++ b/src/Actions/Update/Async/UpdateSpecialPricesAsync.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Update\Async;
+
+use Illuminate\Support\Collection;
+use JustBetter\MagentoAsync\Client\MagentoAsync;
+use JustBetter\MagentoPrices\Contracts\Update\Async\UpdatesSpecialPricesAsync;
+use JustBetter\MagentoPrices\Contracts\Utility\DeletesCurrentSpecialPrices;
+use JustBetter\MagentoPrices\Models\Price;
+
+class UpdateSpecialPricesAsync implements UpdatesSpecialPricesAsync
+{
+    public function __construct(
+        protected MagentoAsync $magentoAsync,
+        protected DeletesCurrentSpecialPrices $currentSpecialPrices
+    ) {}
+
+    public function update(Collection $prices): void
+    {
+        $currentSpecialPrices = $prices->where('has_special', '=', true);
+
+        foreach ($currentSpecialPrices as $price) {
+            $this->currentSpecialPrices->delete($price);
+        }
+
+        $prices->each(fn (Price $price) => $price->update([
+            'has_special' => count($price->special_prices ?? []) > 0,
+        ]));
+
+        $prices = $prices
+            ->reject(fn (Price $price): bool => count($price->special_prices ?? []) === 0);
+
+        if ($prices->isEmpty()) {
+            return;
+        }
+
+        $payload = $prices
+            ->map(function (Price $price): array {
+                return [
+                    'prices' => collect($price->special_prices)
+                        ->map(fn (array $tierPrice): array => array_merge($tierPrice, [
+                            'sku' => $price->sku,
+                        ]))
+                        ->toArray(),
+                ];
+            })
+            ->toArray();
+
+        $this->magentoAsync
+            ->subjects($prices->all())
+            ->postBulk('products/special-price', $payload);
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(UpdatesSpecialPricesAsync::class, static::class);
+    }
+}
diff --git a/src/Actions/Update/Async/UpdateTierPricesAsync.php b/src/Actions/Update/Async/UpdateTierPricesAsync.php
new file mode 100644
index 0000000..dd76557
--- /dev/null
+++ b/src/Actions/Update/Async/UpdateTierPricesAsync.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Update\Async;
+
+use Illuminate\Support\Collection;
+use JustBetter\MagentoAsync\Client\MagentoAsync;
+use JustBetter\MagentoPrices\Contracts\Update\Async\UpdatesTierPricesAsync;
+use JustBetter\MagentoPrices\Contracts\Utility\RetrievesCustomerGroups;
+use JustBetter\MagentoPrices\Models\Price;
+
+class UpdateTierPricesAsync implements UpdatesTierPricesAsync
+{
+    public function __construct(
+        protected MagentoAsync $magentoAsync,
+        protected RetrievesCustomerGroups $customerGroups
+    ) {}
+
+    public function update(Collection $prices): void
+    {
+        $prices = $prices->reject(fn (Price $price): bool => count($price->tier_prices ?? []) === 0);
+
+        if ($prices->isEmpty()) {
+            return;
+        }
+
+        $customerGroups = $this->customerGroups->retrieve();
+
+        $payload = $prices
+            ->map(function (Price $price) use ($customerGroups): array {
+                return [
+                    'prices' => collect($price->tier_prices)
+                        ->whereIn('customer_group', $customerGroups)
+                        ->map(fn (array $tierPrice): array => array_merge($tierPrice, [
+                            'sku' => $price->sku,
+                        ]))
+                        ->toArray(),
+                ];
+            })
+            ->toArray();
+
+        $this->magentoAsync
+            ->subjects($prices->all())
+            ->putBulk('products/tier-prices', $payload);
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(UpdatesTierPricesAsync::class, static::class);
+    }
+}
diff --git a/src/Actions/Update/Sync/UpdateBasePrice.php b/src/Actions/Update/Sync/UpdateBasePrice.php
new file mode 100644
index 0000000..c8eb14b
--- /dev/null
+++ b/src/Actions/Update/Sync/UpdateBasePrice.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Update\Sync;
+
+use Illuminate\Http\Client\Response;
+use JustBetter\MagentoClient\Client\Magento;
+use JustBetter\MagentoPrices\Contracts\Update\Sync\UpdatesBasePrice;
+use JustBetter\MagentoPrices\Models\Price;
+
+class UpdateBasePrice implements UpdatesBasePrice
+{
+    public function __construct(protected Magento $magento) {}
+
+    public function update(Price $price): bool
+    {
+        $payload = collect($price->base_prices)
+            ->map(fn (array $basePrice): array => array_merge($basePrice, [
+                'sku' => $price->sku,
+            ]));
+
+        if ($payload->isEmpty()) {
+            return true;
+        }
+
+        $response = $this->magento
+            ->post('products/base-prices', ['prices' => $payload])
+            ->onError(function (Response $response) use ($price, $payload): void {
+                activity()
+                    ->on($price)
+                    ->useLog('error')
+                    ->withProperties([
+                        'response' => $response->body(),
+                        'payload' => $payload,
+                    ])
+                    ->log('Failed to update base price');
+            });
+
+        return $response->successful();
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(UpdatesBasePrice::class, static::class);
+    }
+}
diff --git a/src/Actions/Update/Sync/UpdatePrice.php b/src/Actions/Update/Sync/UpdatePrice.php
new file mode 100644
index 0000000..bb0f3d6
--- /dev/null
+++ b/src/Actions/Update/Sync/UpdatePrice.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Update\Sync;
+
+use JustBetter\MagentoPrices\Contracts\Update\Sync\UpdatesBasePrice;
+use JustBetter\MagentoPrices\Contracts\Update\Sync\UpdatesPrice;
+use JustBetter\MagentoPrices\Contracts\Update\Sync\UpdatesSpecialPrice;
+use JustBetter\MagentoPrices\Contracts\Update\Sync\UpdatesTierPrice;
+use JustBetter\MagentoPrices\Events\UpdatedPriceEvent;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoProducts\Contracts\ChecksMagentoExistence;
+
+class UpdatePrice implements UpdatesPrice
+{
+    public function __construct(
+        protected ChecksMagentoExistence $magentoExistence,
+        protected UpdatesBasePrice $basePrice,
+        protected UpdatesTierPrice $tierPrice,
+        protected UpdatesSpecialPrice $specialPrice,
+    ) {}
+
+    public function update(Price $price): void
+    {
+        if (! $this->magentoExistence->exists($price->sku)) {
+            $price->update([
+                'update' => false,
+            ]);
+
+            return;
+        }
+
+        $results = [];
+
+        $results[] = $this->basePrice->update($price);
+        $results[] = $this->tierPrice->update($price);
+        $results[] = $this->specialPrice->update($price);
+
+        $hasFailure = in_array(false, $results);
+
+        if ($hasFailure) {
+            $price->registerFailure();
+
+            return;
+        }
+
+        $price->update([
+            'last_updated' => now(),
+            'update' => false,
+        ]);
+
+        event(new UpdatedPriceEvent($price));
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(UpdatesPrice::class, static::class);
+    }
+}
diff --git a/src/Actions/Update/Sync/UpdateSpecialPrice.php b/src/Actions/Update/Sync/UpdateSpecialPrice.php
new file mode 100644
index 0000000..cafb705
--- /dev/null
+++ b/src/Actions/Update/Sync/UpdateSpecialPrice.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Update\Sync;
+
+use Illuminate\Http\Client\Response;
+use JustBetter\MagentoClient\Client\Magento;
+use JustBetter\MagentoPrices\Contracts\Update\Sync\UpdatesSpecialPrice;
+use JustBetter\MagentoPrices\Contracts\Utility\DeletesCurrentSpecialPrices;
+use JustBetter\MagentoPrices\Models\Price;
+
+class UpdateSpecialPrice implements UpdatesSpecialPrice
+{
+    public function __construct(
+        protected Magento $magento,
+        protected DeletesCurrentSpecialPrices $currentSpecialPrices
+    ) {}
+
+    public function update(Price $price): bool
+    {
+        $payload = collect($price->special_prices)
+            ->map(fn (array $specialPrice): array => array_merge($specialPrice, [
+                'sku' => $price->sku,
+            ]));
+
+        if ($price->has_special) {
+            $this->currentSpecialPrices->delete($price);
+        }
+
+        $price->update([
+            'has_special' => $payload->isNotEmpty(),
+        ]);
+
+        if ($payload->isEmpty()) {
+            return true;
+        }
+
+        $response = $this->magento
+            ->post('products/special-price', ['prices' => $payload])
+            ->onError(function (Response $response) use ($price, $payload): void {
+                activity()
+                    ->on($price)
+                    ->useLog('error')
+                    ->withProperties([
+                        'response' => $response->body(),
+                        'payload' => $payload,
+                    ])
+                    ->log('Failed to update special price');
+            });
+
+        return $response->successful();
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(UpdatesSpecialPrice::class, static::class);
+    }
+}
diff --git a/src/Actions/Update/Sync/UpdateTierPrice.php b/src/Actions/Update/Sync/UpdateTierPrice.php
new file mode 100644
index 0000000..ae246b5
--- /dev/null
+++ b/src/Actions/Update/Sync/UpdateTierPrice.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Update\Sync;
+
+use Illuminate\Http\Client\Response;
+use JustBetter\MagentoClient\Client\Magento;
+use JustBetter\MagentoPrices\Contracts\Update\Sync\UpdatesTierPrice;
+use JustBetter\MagentoPrices\Contracts\Utility\RetrievesCustomerGroups;
+use JustBetter\MagentoPrices\Models\Price;
+
+class UpdateTierPrice implements UpdatesTierPrice
+{
+    public function __construct(
+        protected Magento $magento,
+        protected RetrievesCustomerGroups $customerGroups
+    ) {}
+
+    public function update(Price $price): bool
+    {
+        $payload = collect($price->tier_prices)
+            ->whereIn('customer_group', $this->customerGroups->retrieve())
+            ->map(fn (array $tierPrice): array => array_merge($tierPrice, [
+                'sku' => $price->sku,
+            ]));
+
+        if ($payload->isEmpty()) {
+            return true;
+        }
+
+        $response = $this->magento
+            ->post('products/tier-prices', ['prices' => $payload])
+            ->onError(function (Response $response) use ($price, $payload): void {
+                activity()
+                    ->on($price)
+                    ->useLog('error')
+                    ->withProperties([
+                        'response' => $response->body(),
+                        'payload' => $payload,
+                    ])
+                    ->log('Failed to update tier price');
+            });
+
+        return $response->successful();
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(UpdatesTierPrice::class, static::class);
+    }
+}
diff --git a/src/Actions/UpdateMagentoBasePrice.php b/src/Actions/UpdateMagentoBasePrice.php
deleted file mode 100644
index f0e3f01..0000000
--- a/src/Actions/UpdateMagentoBasePrice.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Actions;
-
-use JustBetter\MagentoClient\Client\Magento;
-use JustBetter\MagentoPrices\Contracts\UpdatesMagentoBasePrice;
-use JustBetter\MagentoPrices\Data\PriceData;
-
-class UpdateMagentoBasePrice implements UpdatesMagentoBasePrice
-{
-    public function __construct(protected Magento $magento)
-    {
-    }
-
-    public function update(PriceData $priceData): void
-    {
-        if (config('magento-prices.async')) {
-            $response = $this->magento->postAsync('products/base-prices', ['prices' => $priceData->getMagentoBasePrices()]);
-        } else {
-            $response = $this->magento->post('products/base-prices', ['prices' => $priceData->getMagentoBasePrices()]);
-        }
-
-        $response->throw();
-
-        $model = $priceData->getModel();
-        $model->update(['last_updated' => now()]);
-
-        activity()
-            ->performedOn($model)
-            ->withProperties($response->json())
-            ->log('Updated base price in Magento');
-    }
-
-    public static function bind(): void
-    {
-        app()->singleton(UpdatesMagentoBasePrice::class, static::class);
-    }
-}
diff --git a/src/Actions/UpdateMagentoSpecialPrices.php b/src/Actions/UpdateMagentoSpecialPrices.php
deleted file mode 100644
index 86e4077..0000000
--- a/src/Actions/UpdateMagentoSpecialPrices.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Actions;
-
-use Illuminate\Support\Enumerable;
-use JustBetter\MagentoClient\Client\Magento;
-use JustBetter\MagentoPrices\Contracts\UpdatesMagentoSpecialPrice;
-use JustBetter\MagentoPrices\Data\PriceData;
-
-class UpdateMagentoSpecialPrices implements UpdatesMagentoSpecialPrice
-{
-    public function __construct(protected Magento $magento)
-    {
-    }
-
-    public function update(PriceData $priceData): void
-    {
-        $this->deleteCurrentSpecialPrices($priceData->sku);
-
-        if (config('magento-prices.async')) {
-            $response = $this->magento->postAsync('products/special-price', ['prices' => $priceData->getMagentoSpecialPrices()]);
-        } else {
-            $response = $this->magento->post('products/special-price', ['prices' => $priceData->getMagentoSpecialPrices()]);
-        }
-
-        $response->throw();
-
-        $model = $priceData->getModel();
-        $model->update(['last_updated' => now()]);
-
-        activity()
-            ->performedOn($model)
-            ->withProperties($response->json())
-            ->log('Updated special price in Magento');
-    }
-
-    protected function deleteCurrentSpecialPrices(string $sku): void
-    {
-        $this->magento
-            ->post('products/special-price-information', ['skus' => [$sku]])
-            ->throw()
-            ->collect()
-            ->chunk(20)
-            ->each(function (Enumerable $enumerable): void {
-                $this->magento
-                    ->post('products/special-price-delete', ['prices' => $enumerable->toArray()])
-                    ->throw();
-            });
-    }
-
-    public static function bind(): void
-    {
-        app()->singleton(UpdatesMagentoSpecialPrice::class, static::class);
-    }
-}
diff --git a/src/Actions/UpdateMagentoTierPrices.php b/src/Actions/UpdateMagentoTierPrices.php
deleted file mode 100644
index 8231315..0000000
--- a/src/Actions/UpdateMagentoTierPrices.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Actions;
-
-use JustBetter\MagentoClient\Client\Magento;
-use JustBetter\MagentoPrices\Contracts\UpdatesMagentoTierPrice;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Exceptions\PriceUpdateException;
-use JustBetter\MagentoPrices\Jobs\ImportCustomerGroupsJob;
-use JustBetter\MagentoPrices\Models\MagentoCustomerGroup;
-
-class UpdateMagentoTierPrices implements UpdatesMagentoTierPrice
-{
-    public function __construct(
-        protected Magento $magento
-    ) {
-    }
-
-    public function update(PriceData $priceData): void
-    {
-        $existingGroups = $this->getGroups();
-
-        $tierPrices = collect($priceData->getMagentoTierPrices())
-            ->whereIn('customer_group', $existingGroups);
-
-        if (config('magento-prices.async')) {
-            $response = $this->magento->putAsync('products/tier-prices', ['prices' => $tierPrices->toArray()]);
-        } else {
-            $response = $this->magento->put('products/tier-prices', ['prices' => $tierPrices->toArray()]);
-        }
-
-        $response->throw();
-
-        $model = $priceData->getModel();
-        $model->update(['last_updated' => now()]);
-
-        activity()
-            ->performedOn($model)
-            ->withProperties($response->json())
-            ->log('Updated tier price in Magento');
-    }
-
-    protected function getGroups(): array
-    {
-        cache()->remember('magento:prices:customer:groups:imported', now()->addDay(), function (): bool {
-            ImportCustomerGroupsJob::dispatch();
-
-            return true;
-        });
-
-        $groups = MagentoCustomerGroup::query()->pluck('code');
-
-        if ($groups->isEmpty()) {
-            throw new PriceUpdateException('The Magento customer groups are not imported');
-        }
-
-        return $groups
-            ->push('ALL GROUPS')
-            ->toArray();
-    }
-
-    public static function bind(): void
-    {
-        app()->singleton(UpdatesMagentoTierPrice::class, static::class);
-    }
-}
diff --git a/src/Actions/Utility/CheckTierDuplicates.php b/src/Actions/Utility/CheckTierDuplicates.php
new file mode 100644
index 0000000..1b23577
--- /dev/null
+++ b/src/Actions/Utility/CheckTierDuplicates.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Utility;
+
+use Illuminate\Support\Collection;
+use JustBetter\MagentoPrices\Contracts\Utility\ChecksTierDuplicates;
+use JustBetter\MagentoPrices\Exceptions\DuplicateTierPriceException;
+use JustBetter\MagentoPrices\Models\Price;
+use Spatie\Activitylog\ActivityLogger;
+
+/**
+ * Check if the tier prices have duplicates.
+ * When this is the case, Magento will always reject the update.
+ */
+class CheckTierDuplicates implements ChecksTierDuplicates
+{
+    public function check(Price $model, array $tierPrices): void
+    {
+        $duplicates = collect($tierPrices)
+            ->groupBy(['website_id', 'quantity', 'customer_group'])
+            ->flatten(2)
+            ->filter(fn (Collection $matches): bool => $matches->count() > 1);
+
+        if ($duplicates->isEmpty()) {
+            return;
+        }
+
+        activity()
+            ->when($model->exists, fn (ActivityLogger $logger): ActivityLogger => $logger->on($model))
+            ->useLog('error')
+            ->withProperties([
+                'duplicate' => $duplicates->toArray(),
+            ])
+            ->log("Duplicate tier prices found for $model->sku");
+
+        throw new DuplicateTierPriceException("Duplicate tier prices found for $model->sku. Duplicates: ".json_encode($duplicates->toArray()));
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(ChecksTierDuplicates::class, static::class);
+    }
+}
diff --git a/src/Actions/Utility/DeleteCurrentSpecialPrices.php b/src/Actions/Utility/DeleteCurrentSpecialPrices.php
new file mode 100644
index 0000000..e5ba921
--- /dev/null
+++ b/src/Actions/Utility/DeleteCurrentSpecialPrices.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Utility;
+
+use Illuminate\Http\Client\Response;
+use Illuminate\Support\Enumerable;
+use JustBetter\MagentoClient\Client\Magento;
+use JustBetter\MagentoPrices\Contracts\Utility\DeletesCurrentSpecialPrices;
+use JustBetter\MagentoPrices\Models\Price;
+
+class DeleteCurrentSpecialPrices implements DeletesCurrentSpecialPrices
+{
+    public function __construct(protected Magento $magento) {}
+
+    public function delete(Price $price): void
+    {
+        $this->magento
+            ->post('products/special-price-information', ['skus' => [$price->sku]])
+            ->throw()
+            ->collect()
+            ->chunk(20)
+            ->each(function (Enumerable $specialPrices) use ($price): void {
+                $this->magento
+                    ->post('products/special-price-delete', ['prices' => $specialPrices->toArray()])
+                    ->onError(function (Response $response) use ($price, $specialPrices): void {
+                        activity()
+                            ->on($price)
+                            ->useLog('error')
+                            ->withProperties([
+                                'response' => $response->body(),
+                                'payload' => $specialPrices->toArray(),
+                            ])
+                            ->log('Failed to remove special price');
+                    })
+                    ->throw();
+            });
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(DeletesCurrentSpecialPrices::class, static::class);
+    }
+}
diff --git a/src/Actions/ImportCustomerGroups.php b/src/Actions/Utility/ImportCustomerGroups.php
similarity index 55%
rename from src/Actions/ImportCustomerGroups.php
rename to src/Actions/Utility/ImportCustomerGroups.php
index 27b77a9..0beeec1 100644
--- a/src/Actions/ImportCustomerGroups.php
+++ b/src/Actions/Utility/ImportCustomerGroups.php
@@ -1,57 +1,57 @@
 <?php
 
-namespace JustBetter\MagentoPrices\Actions;
+namespace JustBetter\MagentoPrices\Actions\Utility;
 
 use JustBetter\MagentoClient\Client\Magento;
-use JustBetter\MagentoPrices\Contracts\ImportsCustomerGroups;
-use JustBetter\MagentoPrices\Models\MagentoCustomerGroup;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
+use JustBetter\MagentoPrices\Contracts\Utility\ImportsCustomerGroups;
+use JustBetter\MagentoPrices\Models\CustomerGroup;
+use JustBetter\MagentoPrices\Models\Price;
 
 class ImportCustomerGroups implements ImportsCustomerGroups
 {
     public function __construct(
         protected Magento $magento
-    ) {
-    }
+    ) {}
 
     public function import(): void
     {
         $date = now();
 
-        $this->magento->lazy('customerGroups/search')->each(function (array $group) use ($date): void {
-            MagentoCustomerGroup::query()->updateOrCreate([
-                'code' => $group['code'],
-            ], [
-                'data' => $group,
-                'imported_at' => $date,
-            ]);
-        });
-
-        $deletions = MagentoCustomerGroup::query()
+        $this->magento->lazy('customerGroups/search')
+            ->each(function (array $group) use ($date): void {
+                CustomerGroup::query()->updateOrCreate([
+                    'code' => $group['code'],
+                ], [
+                    'data' => $group,
+                    'imported_at' => $date,
+                ]);
+            });
+
+        $deletions = CustomerGroup::query()
             ->where('imported_at', '<', $date)
             ->orWhereNull('imported_at')
             ->get();
 
-        $newGroupCount = MagentoCustomerGroup::query()
+        $newGroupCount = CustomerGroup::query()
             ->where('created_at', '>=', $date)
             ->count();
 
         // If a new group has been added, tier prices may be missing.
         if ($newGroupCount > 0) {
-            MagentoPrice::query()
+            Price::query()
                 ->where('sync', '=', true)
                 ->update(['update' => true]);
         }
 
         // Previous updates may have failed if a group has been removed.
         if ($deletions->isNotEmpty()) {
-            MagentoPrice::query()->update([
+            Price::query()->update([
                 'sync' => true,
                 'update' => true,
             ]);
         }
 
-        $deletions->each(function (MagentoCustomerGroup $group): void {
+        $deletions->each(function (CustomerGroup $group): void {
             $group->delete();
         });
     }
diff --git a/src/Actions/Utility/ProcessProductsWithMissingPrices.php b/src/Actions/Utility/ProcessProductsWithMissingPrices.php
new file mode 100644
index 0000000..836d791
--- /dev/null
+++ b/src/Actions/Utility/ProcessProductsWithMissingPrices.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Utility;
+
+use Illuminate\Foundation\Bus\PendingDispatch;
+use Illuminate\Support\Collection;
+use Illuminate\Support\LazyCollection;
+use JustBetter\MagentoClient\Client\Magento;
+use JustBetter\MagentoClient\Query\SearchCriteria;
+use JustBetter\MagentoPrices\Contracts\Utility\ProcessesProductsWithMissingPrices;
+use JustBetter\MagentoPrices\Jobs\Retrieval\RetrievePriceJob;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePriceJob;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePricesAsyncJob;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Repository\BaseRepository;
+
+class ProcessProductsWithMissingPrices implements ProcessesProductsWithMissingPrices
+{
+    public function __construct(protected Magento $magento) {}
+
+    public function process(): void
+    {
+        $skus = $this->retrieveSkus();
+
+        /** @var bool $async */
+        $async = config('magento-prices.async');
+
+        $pricesToUpdate = collect();
+
+        foreach ($skus as $sku) {
+            /** @var ?Price $price */
+            $price = Price::query()->firstWhere('sku', '=', $sku);
+
+            if ($price !== null) {
+
+                if ($async) {
+                    $pricesToUpdate[] = $price;
+                } else {
+                    UpdatePriceJob::dispatch($price);
+                }
+
+                continue;
+            }
+
+            RetrievePriceJob::dispatch($sku);
+        }
+
+        if ($async) {
+            $repository = BaseRepository::resolve();
+
+            $pricesToUpdate
+                ->chunk($repository->updateLimit())
+                ->each(fn (Collection $chunk): PendingDispatch => UpdatePricesAsyncJob::dispatch($chunk));
+        }
+    }
+
+    /** @return LazyCollection<int, string> */
+    public function retrieveSkus(): LazyCollection
+    {
+        return LazyCollection::make(function () {
+            $searchCriteria = SearchCriteria::make()
+                ->select(['sku', 'price', 'type_id'])
+                ->get();
+
+            $products = $this->magento->lazy('products', $searchCriteria);
+
+            foreach ($products as $product) {
+                if (
+                    (array_key_exists('price', $product) && floatval($product['price']) > 0) ||
+                    (array_key_exists('type_id', $product) && $product['type_id'] != 'simple')
+                ) {
+                    continue;
+                }
+
+                yield $product['sku'];
+            }
+        });
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(ProcessesProductsWithMissingPrices::class, static::class);
+    }
+}
diff --git a/src/Actions/Utility/RetrieveCustomerGroups.php b/src/Actions/Utility/RetrieveCustomerGroups.php
new file mode 100644
index 0000000..bb58c1d
--- /dev/null
+++ b/src/Actions/Utility/RetrieveCustomerGroups.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Actions\Utility;
+
+use JustBetter\MagentoPrices\Contracts\Utility\RetrievesCustomerGroups;
+use JustBetter\MagentoPrices\Exceptions\PriceUpdateException;
+use JustBetter\MagentoPrices\Jobs\Utility\ImportCustomerGroupsJob;
+use JustBetter\MagentoPrices\Models\CustomerGroup;
+
+class RetrieveCustomerGroups implements RetrievesCustomerGroups
+{
+    public function retrieve(): array
+    {
+        cache()->remember('magento:prices:customer:groups:imported', now()->addDay(), function (): bool {
+            ImportCustomerGroupsJob::dispatch();
+
+            return true;
+        });
+
+        $groups = CustomerGroup::query()->pluck('code');
+
+        if ($groups->isEmpty()) {
+            throw new PriceUpdateException('The Magento customer groups are not imported');
+        }
+
+        return $groups
+            ->push('ALL GROUPS')
+            ->toArray();
+    }
+
+    public static function bind(): void
+    {
+        app()->singleton(RetrievesCustomerGroups::class, static::class);
+    }
+}
diff --git a/src/Commands/MonitorWaitTimesCommand.php b/src/Commands/MonitorWaitTimesCommand.php
deleted file mode 100644
index abc3c55..0000000
--- a/src/Commands/MonitorWaitTimesCommand.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Commands;
-
-use Illuminate\Console\Command;
-use JustBetter\MagentoPrices\Jobs\MonitorWaitTimesJob;
-
-class MonitorWaitTimesCommand extends Command
-{
-    protected $signature = 'magento:price:monitor-wait-times';
-
-    protected $description = 'Dispatch job to monitor the wait times';
-
-    public function handle(): int
-    {
-        $this->info('Dispatching...');
-
-        MonitorWaitTimesJob::dispatch();
-
-        $this->info('Done!');
-
-        return static::SUCCESS;
-    }
-}
diff --git a/src/Commands/ProcessPricesCommand.php b/src/Commands/ProcessPricesCommand.php
new file mode 100644
index 0000000..beeb1f6
--- /dev/null
+++ b/src/Commands/ProcessPricesCommand.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Commands;
+
+use Illuminate\Console\Command;
+use JustBetter\MagentoPrices\Jobs\ProcessPricesJob;
+
+class ProcessPricesCommand extends Command
+{
+    protected $signature = 'magento-prices:process';
+
+    protected $description = 'Process prices that have the retrieve and update flags set';
+
+    public function handle(): int
+    {
+        ProcessPricesJob::dispatch();
+
+        return static::SUCCESS;
+    }
+}
diff --git a/src/Commands/Retrieval/RetrieveAllPricesCommand.php b/src/Commands/Retrieval/RetrieveAllPricesCommand.php
new file mode 100644
index 0000000..0b4ca6b
--- /dev/null
+++ b/src/Commands/Retrieval/RetrieveAllPricesCommand.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Commands\Retrieval;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Carbon;
+use JustBetter\MagentoPrices\Jobs\Retrieval\RetrieveAllPricesJob;
+
+class RetrieveAllPricesCommand extends Command
+{
+    protected $signature = 'magento-prices:retrieve-all {from?}';
+
+    protected $description = 'Retrieve all prices, optionally filtered by date';
+
+    public function handle(): int
+    {
+        /** @var ?string $from */
+        $from = $this->argument('from');
+
+        $carbon = blank($from) ? null : Carbon::parse($from);
+
+        RetrieveAllPricesJob::dispatch($carbon);
+
+        return static::SUCCESS;
+    }
+}
diff --git a/src/Commands/Retrieval/RetrievePriceCommand.php b/src/Commands/Retrieval/RetrievePriceCommand.php
new file mode 100644
index 0000000..ee12925
--- /dev/null
+++ b/src/Commands/Retrieval/RetrievePriceCommand.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Commands\Retrieval;
+
+use Illuminate\Console\Command;
+use JustBetter\MagentoPrices\Jobs\Retrieval\RetrievePriceJob;
+
+class RetrievePriceCommand extends Command
+{
+    protected $signature = 'magento-prices:retrieve {sku}';
+
+    protected $description = 'Retrieve price for a specific SKU';
+
+    public function handle(): int
+    {
+        /** @var string $sku */
+        $sku = $this->argument('sku');
+
+        RetrievePriceJob::dispatch($sku);
+
+        return static::SUCCESS;
+    }
+}
diff --git a/src/Commands/RetrievePricesCommand.php b/src/Commands/RetrievePricesCommand.php
deleted file mode 100644
index 1c5976c..0000000
--- a/src/Commands/RetrievePricesCommand.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Commands;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Carbon;
-use JustBetter\MagentoPrices\Jobs\RetrievePriceJob;
-use JustBetter\MagentoPrices\Jobs\RetrievePricesJob;
-
-class RetrievePricesCommand extends Command
-{
-    protected $signature = 'magento:price:retrieve {sku?} {--date=}';
-
-    protected $description = 'Dispatch job to retrieve price(s)';
-
-    public function handle(): int
-    {
-        $this->info('Dispatching...');
-
-        if ($this->argument('sku') !== null) {
-            RetrievePriceJob::dispatch($this->argument('sku'));
-        } else {
-            RetrievePricesJob::dispatch($this->option('date') !== null ? Carbon::parse($this->option('date')) : null);
-        }
-
-        $this->info('Done!');
-
-        return static::SUCCESS;
-    }
-}
diff --git a/src/Commands/SearchMissingPricesCommand.php b/src/Commands/SearchMissingPricesCommand.php
deleted file mode 100644
index 5559879..0000000
--- a/src/Commands/SearchMissingPricesCommand.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Commands;
-
-use Illuminate\Console\Command;
-use JustBetter\MagentoPrices\Jobs\SyncMissingPricesJob;
-
-class SearchMissingPricesCommand extends Command
-{
-    protected $signature = 'magento:price:missing';
-
-    protected $description = 'Dispatch job to search for missing prices in Magento';
-
-    public function handle(): int
-    {
-        $this->info('Dispatching...');
-
-        SyncMissingPricesJob::dispatch();
-
-        $this->info('Done!');
-
-        return static::SUCCESS;
-    }
-}
diff --git a/src/Commands/SyncPricesCommand.php b/src/Commands/SyncPricesCommand.php
deleted file mode 100644
index 0f1fd72..0000000
--- a/src/Commands/SyncPricesCommand.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Commands;
-
-use Illuminate\Console\Command;
-use JustBetter\MagentoPrices\Jobs\SyncPricesJob as SyncPricesJob;
-
-class SyncPricesCommand extends Command
-{
-    protected $signature = 'magento:price:sync {limit?} {--sync}';
-
-    protected $description = 'Dispatch job to sync price(s)';
-
-    public function handle(): int
-    {
-        if ($this->option('sync')) {
-            /** @phpstan-ignore-next-line */
-            SyncPricesJob::dispatchSync($this->argument('limit'), $this->argument('limit'));
-        } else {
-            /** @phpstan-ignore-next-line */
-            SyncPricesJob::dispatch($this->argument('limit'), $this->argument('limit'));
-        }
-
-        return static::SUCCESS;
-    }
-}
diff --git a/src/Commands/Update/UpdateAllPricesCommand.php b/src/Commands/Update/UpdateAllPricesCommand.php
new file mode 100644
index 0000000..36cad93
--- /dev/null
+++ b/src/Commands/Update/UpdateAllPricesCommand.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Commands\Update;
+
+use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Foundation\Bus\PendingDispatch;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePriceJob;
+use JustBetter\MagentoPrices\Models\Price;
+
+class UpdateAllPricesCommand extends Command
+{
+    protected $signature = 'magento-prices:update-all';
+
+    protected $description = 'Update all prices to Magento';
+
+    public function handle(): int
+    {
+        Price::query()
+            ->whereHas('product', function (Builder $query): void {
+                $query->where('exists_in_magento', '=', true);
+            })
+            ->get()
+            ->each(fn (Price $price): PendingDispatch => UpdatePriceJob::dispatch($price));
+
+        return static::SUCCESS;
+    }
+}
diff --git a/src/Commands/Update/UpdatePriceCommand.php b/src/Commands/Update/UpdatePriceCommand.php
new file mode 100644
index 0000000..8f16491
--- /dev/null
+++ b/src/Commands/Update/UpdatePriceCommand.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Commands\Update;
+
+use Illuminate\Console\Command;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePriceJob;
+use JustBetter\MagentoPrices\Models\Price;
+
+class UpdatePriceCommand extends Command
+{
+    protected $signature = 'magento-prices:update {sku}';
+
+    protected $description = 'Dispatch job to update a price in Magento';
+
+    public function handle(): int
+    {
+        /** @var string $sku */
+        $sku = $this->argument('sku');
+
+        /** @var Price $price */
+        $price = Price::query()
+            ->where('sku', '=', $sku)
+            ->firstOrFail();
+
+        UpdatePriceJob::dispatch($price);
+
+        return static::SUCCESS;
+    }
+}
diff --git a/src/Commands/UpdatePriceCommand.php b/src/Commands/UpdatePriceCommand.php
deleted file mode 100644
index b5749db..0000000
--- a/src/Commands/UpdatePriceCommand.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Commands;
-
-use Illuminate\Console\Command;
-use JustBetter\MagentoPrices\Jobs\UpdatePriceJob;
-
-class UpdatePriceCommand extends Command
-{
-    protected $signature = 'magento:price:update {sku}';
-
-    protected $description = 'Dispatch job to update price(s) in Magento';
-
-    public function handle(): int
-    {
-        $this->info('Dispatching...');
-
-        /** @var string $sku */
-        $sku = $this->argument('sku');
-
-        UpdatePriceJob::dispatch($sku);
-
-        $this->info('Done!');
-
-        return static::SUCCESS;
-    }
-}
diff --git a/src/Commands/ImportCustomerGroupsCommand.php b/src/Commands/Utility/ImportCustomerGroupsCommand.php
similarity index 60%
rename from src/Commands/ImportCustomerGroupsCommand.php
rename to src/Commands/Utility/ImportCustomerGroupsCommand.php
index 63d3fbe..ccd3f94 100644
--- a/src/Commands/ImportCustomerGroupsCommand.php
+++ b/src/Commands/Utility/ImportCustomerGroupsCommand.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace JustBetter\MagentoPrices\Commands;
+namespace JustBetter\MagentoPrices\Commands\Utility;
 
 use Illuminate\Console\Command;
-use JustBetter\MagentoPrices\Jobs\ImportCustomerGroupsJob;
+use JustBetter\MagentoPrices\Jobs\Utility\ImportCustomerGroupsJob;
 
 class ImportCustomerGroupsCommand extends Command
 {
-    protected $signature = 'magento:price:import-customer-groups';
+    protected $signature = 'magento-prices:import-customer-groups';
 
     protected $description = 'Import all customer groups from Magento';
 
diff --git a/src/Commands/Utility/ProcessProductsWithMissingPricesCommand.php b/src/Commands/Utility/ProcessProductsWithMissingPricesCommand.php
new file mode 100644
index 0000000..26ade63
--- /dev/null
+++ b/src/Commands/Utility/ProcessProductsWithMissingPricesCommand.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Commands\Utility;
+
+use Illuminate\Console\Command;
+use JustBetter\MagentoPrices\Jobs\Utility\ProcessProductsWithMissingPricesJob;
+
+class ProcessProductsWithMissingPricesCommand extends Command
+{
+    protected $signature = 'magento-prices:process-missing-prices';
+
+    protected $description = 'Update prices that are missing in Magneto if they are available';
+
+    public function handle(): int
+    {
+        ProcessProductsWithMissingPricesJob::dispatch();
+
+        return static::SUCCESS;
+    }
+}
diff --git a/src/Concerns/ValidatesData.php b/src/Concerns/ValidatesData.php
new file mode 100644
index 0000000..65f8b23
--- /dev/null
+++ b/src/Concerns/ValidatesData.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Concerns;
+
+use Illuminate\Support\Facades\Validator;
+
+/**
+ * @method array toArray()
+ */
+trait ValidatesData
+{
+    public array $rules = [];
+
+    public function validate(array $data): void
+    {
+        Validator::make($data, $this->rules())->validate();
+    }
+
+    public function validated(): array
+    {
+        return Validator::make($this->toArray(), $this->rules())->validated();
+    }
+
+    public function rules(): array
+    {
+        return $this->rules;
+    }
+}
diff --git a/src/Contracts/ChecksTierDuplicates.php b/src/Contracts/ChecksTierDuplicates.php
deleted file mode 100644
index e28a287..0000000
--- a/src/Contracts/ChecksTierDuplicates.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Contracts;
-
-use Illuminate\Support\Collection;
-
-interface ChecksTierDuplicates
-{
-    public function check(string $sku, Collection $tierPrices): void;
-}
diff --git a/src/Contracts/DeterminesPricesEqual.php b/src/Contracts/DeterminesPricesEqual.php
deleted file mode 100644
index 9947d12..0000000
--- a/src/Contracts/DeterminesPricesEqual.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Contracts;
-
-use JustBetter\MagentoPrices\Data\PriceData;
-
-interface DeterminesPricesEqual
-{
-    public function equals(PriceData $a, PriceData $b): bool;
-}
diff --git a/src/Contracts/FindsProductsWithMissingPrices.php b/src/Contracts/FindsProductsWithMissingPrices.php
deleted file mode 100644
index 9bb59ce..0000000
--- a/src/Contracts/FindsProductsWithMissingPrices.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Contracts;
-
-use Illuminate\Support\Enumerable;
-
-interface FindsProductsWithMissingPrices
-{
-    /** @return Enumerable<int, string> list of skus */
-    public function retrieve(): Enumerable;
-}
diff --git a/src/Contracts/MonitorsWaitTimes.php b/src/Contracts/MonitorsWaitTimes.php
deleted file mode 100644
index efd5c5f..0000000
--- a/src/Contracts/MonitorsWaitTimes.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Contracts;
-
-interface MonitorsWaitTimes
-{
-    public function monitor(): void;
-}
diff --git a/src/Contracts/ProcessesPrice.php b/src/Contracts/ProcessesPrice.php
deleted file mode 100644
index 1dbe472..0000000
--- a/src/Contracts/ProcessesPrice.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Contracts;
-
-use JustBetter\MagentoPrices\Data\PriceData;
-
-interface ProcessesPrice
-{
-    public function process(PriceData $priceData, bool $forceUpdate = false): void;
-}
diff --git a/src/Contracts/ProcessesPrices.php b/src/Contracts/ProcessesPrices.php
new file mode 100644
index 0000000..254464b
--- /dev/null
+++ b/src/Contracts/ProcessesPrices.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts;
+
+interface ProcessesPrices
+{
+    public function process(): void;
+}
diff --git a/src/Contracts/Retrieval/RetrievesAllPrices.php b/src/Contracts/Retrieval/RetrievesAllPrices.php
new file mode 100644
index 0000000..ad2c0e0
--- /dev/null
+++ b/src/Contracts/Retrieval/RetrievesAllPrices.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Retrieval;
+
+use Illuminate\Support\Carbon;
+
+interface RetrievesAllPrices
+{
+    public function retrieve(?Carbon $from): void;
+}
diff --git a/src/Contracts/Retrieval/RetrievesPrice.php b/src/Contracts/Retrieval/RetrievesPrice.php
new file mode 100644
index 0000000..40d3cec
--- /dev/null
+++ b/src/Contracts/Retrieval/RetrievesPrice.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Retrieval;
+
+interface RetrievesPrice
+{
+    public function retrieve(string $sku, bool $forceUpdate): void;
+}
diff --git a/src/Contracts/Retrieval/SavesPrice.php b/src/Contracts/Retrieval/SavesPrice.php
new file mode 100644
index 0000000..97ccaa2
--- /dev/null
+++ b/src/Contracts/Retrieval/SavesPrice.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Retrieval;
+
+use JustBetter\MagentoPrices\Data\PriceData;
+
+interface SavesPrice
+{
+    public function save(PriceData $priceData, bool $forceUpdate): void;
+}
diff --git a/src/Contracts/RetrievesPrice.php b/src/Contracts/RetrievesPrice.php
deleted file mode 100644
index 05a3862..0000000
--- a/src/Contracts/RetrievesPrice.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Contracts;
-
-use JustBetter\MagentoPrices\Data\PriceData;
-
-interface RetrievesPrice
-{
-    public function retrieve(string $sku): ?PriceData;
-}
diff --git a/src/Contracts/RetrievesSkus.php b/src/Contracts/RetrievesSkus.php
deleted file mode 100644
index 27d8029..0000000
--- a/src/Contracts/RetrievesSkus.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Contracts;
-
-use Carbon\Carbon;
-use Illuminate\Support\Enumerable;
-
-interface RetrievesSkus
-{
-    /** @return Enumerable<int, string> */
-    public function retrieveAll(): Enumerable;
-
-    /** @return Enumerable<int, string> */
-    public function retrieveByDate(Carbon $from): Enumerable;
-}
diff --git a/src/Contracts/SyncsPrices.php b/src/Contracts/SyncsPrices.php
deleted file mode 100644
index 8c942e9..0000000
--- a/src/Contracts/SyncsPrices.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Contracts;
-
-interface SyncsPrices
-{
-    public function sync(?int $retrieveLimit = null, ?int $updateLimit = null): void;
-}
diff --git a/src/Contracts/Update/Async/UpdatesBasePricesAsync.php b/src/Contracts/Update/Async/UpdatesBasePricesAsync.php
new file mode 100644
index 0000000..f9ff2da
--- /dev/null
+++ b/src/Contracts/Update/Async/UpdatesBasePricesAsync.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Update\Async;
+
+use Illuminate\Support\Collection;
+use JustBetter\MagentoPrices\Models\Price;
+
+interface UpdatesBasePricesAsync
+{
+    /** @param Collection<int, Price> $prices */
+    public function update(Collection $prices): void;
+}
diff --git a/src/Contracts/Update/Async/UpdatesPricesAsync.php b/src/Contracts/Update/Async/UpdatesPricesAsync.php
new file mode 100644
index 0000000..d86723e
--- /dev/null
+++ b/src/Contracts/Update/Async/UpdatesPricesAsync.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Update\Async;
+
+use Illuminate\Support\Collection;
+use JustBetter\MagentoPrices\Models\Price;
+
+interface UpdatesPricesAsync
+{
+    /** @param Collection<int, Price> $prices */
+    public function update(Collection $prices): void;
+}
diff --git a/src/Contracts/Update/Async/UpdatesSpecialPricesAsync.php b/src/Contracts/Update/Async/UpdatesSpecialPricesAsync.php
new file mode 100644
index 0000000..c36de89
--- /dev/null
+++ b/src/Contracts/Update/Async/UpdatesSpecialPricesAsync.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Update\Async;
+
+use Illuminate\Support\Collection;
+use JustBetter\MagentoPrices\Models\Price;
+
+interface UpdatesSpecialPricesAsync
+{
+    /** @param Collection<int, Price> $prices */
+    public function update(Collection $prices): void;
+}
diff --git a/src/Contracts/Update/Async/UpdatesTierPricesAsync.php b/src/Contracts/Update/Async/UpdatesTierPricesAsync.php
new file mode 100644
index 0000000..75ee601
--- /dev/null
+++ b/src/Contracts/Update/Async/UpdatesTierPricesAsync.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Update\Async;
+
+use Illuminate\Support\Collection;
+use JustBetter\MagentoPrices\Models\Price;
+
+interface UpdatesTierPricesAsync
+{
+    /** @param Collection<int, Price> $prices */
+    public function update(Collection $prices): void;
+}
diff --git a/src/Contracts/Update/Sync/UpdatesBasePrice.php b/src/Contracts/Update/Sync/UpdatesBasePrice.php
new file mode 100644
index 0000000..1fc0cfd
--- /dev/null
+++ b/src/Contracts/Update/Sync/UpdatesBasePrice.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Update\Sync;
+
+use JustBetter\MagentoPrices\Models\Price;
+
+interface UpdatesBasePrice
+{
+    public function update(Price $price): bool;
+}
diff --git a/src/Contracts/Update/Sync/UpdatesPrice.php b/src/Contracts/Update/Sync/UpdatesPrice.php
new file mode 100644
index 0000000..1d96bae
--- /dev/null
+++ b/src/Contracts/Update/Sync/UpdatesPrice.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Update\Sync;
+
+use JustBetter\MagentoPrices\Models\Price;
+
+interface UpdatesPrice
+{
+    public function update(Price $price): void;
+}
diff --git a/src/Contracts/Update/Sync/UpdatesSpecialPrice.php b/src/Contracts/Update/Sync/UpdatesSpecialPrice.php
new file mode 100644
index 0000000..74bd227
--- /dev/null
+++ b/src/Contracts/Update/Sync/UpdatesSpecialPrice.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Update\Sync;
+
+use JustBetter\MagentoPrices\Models\Price;
+
+interface UpdatesSpecialPrice
+{
+    public function update(Price $price): bool;
+}
diff --git a/src/Contracts/Update/Sync/UpdatesTierPrice.php b/src/Contracts/Update/Sync/UpdatesTierPrice.php
new file mode 100644
index 0000000..755c983
--- /dev/null
+++ b/src/Contracts/Update/Sync/UpdatesTierPrice.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Update\Sync;
+
+use JustBetter\MagentoPrices\Models\Price;
+
+interface UpdatesTierPrice
+{
+    public function update(Price $price): bool;
+}
diff --git a/src/Contracts/UpdatesMagentoBasePrice.php b/src/Contracts/UpdatesMagentoBasePrice.php
deleted file mode 100644
index 1ceb44b..0000000
--- a/src/Contracts/UpdatesMagentoBasePrice.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Contracts;
-
-use JustBetter\MagentoPrices\Data\PriceData;
-
-interface UpdatesMagentoBasePrice
-{
-    public function update(PriceData $priceData): void;
-}
diff --git a/src/Contracts/UpdatesMagentoSpecialPrice.php b/src/Contracts/UpdatesMagentoSpecialPrice.php
deleted file mode 100644
index 0c32348..0000000
--- a/src/Contracts/UpdatesMagentoSpecialPrice.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Contracts;
-
-use JustBetter\MagentoPrices\Data\PriceData;
-
-interface UpdatesMagentoSpecialPrice
-{
-    public function update(PriceData $priceData): void;
-}
diff --git a/src/Contracts/UpdatesMagentoTierPrice.php b/src/Contracts/UpdatesMagentoTierPrice.php
deleted file mode 100644
index c4f014b..0000000
--- a/src/Contracts/UpdatesMagentoTierPrice.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Contracts;
-
-use JustBetter\MagentoPrices\Data\PriceData;
-
-interface UpdatesMagentoTierPrice
-{
-    public function update(PriceData $priceData): void;
-}
diff --git a/src/Contracts/Utility/ChecksTierDuplicates.php b/src/Contracts/Utility/ChecksTierDuplicates.php
new file mode 100644
index 0000000..acbf5c5
--- /dev/null
+++ b/src/Contracts/Utility/ChecksTierDuplicates.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Utility;
+
+use JustBetter\MagentoPrices\Models\Price;
+
+interface ChecksTierDuplicates
+{
+    public function check(Price $model, array $tierPrices): void;
+}
diff --git a/src/Contracts/Utility/DeletesCurrentSpecialPrices.php b/src/Contracts/Utility/DeletesCurrentSpecialPrices.php
new file mode 100644
index 0000000..525d63b
--- /dev/null
+++ b/src/Contracts/Utility/DeletesCurrentSpecialPrices.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Utility;
+
+use JustBetter\MagentoPrices\Models\Price;
+
+interface DeletesCurrentSpecialPrices
+{
+    public function delete(Price $price): void;
+}
diff --git a/src/Contracts/ImportsCustomerGroups.php b/src/Contracts/Utility/ImportsCustomerGroups.php
similarity index 59%
rename from src/Contracts/ImportsCustomerGroups.php
rename to src/Contracts/Utility/ImportsCustomerGroups.php
index 7e5719d..f35090b 100644
--- a/src/Contracts/ImportsCustomerGroups.php
+++ b/src/Contracts/Utility/ImportsCustomerGroups.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace JustBetter\MagentoPrices\Contracts;
+namespace JustBetter\MagentoPrices\Contracts\Utility;
 
 interface ImportsCustomerGroups
 {
diff --git a/src/Contracts/Utility/ProcessesProductsWithMissingPrices.php b/src/Contracts/Utility/ProcessesProductsWithMissingPrices.php
new file mode 100644
index 0000000..b3c7c95
--- /dev/null
+++ b/src/Contracts/Utility/ProcessesProductsWithMissingPrices.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Utility;
+
+interface ProcessesProductsWithMissingPrices
+{
+    public function process(): void;
+}
diff --git a/src/Contracts/Utility/RetrievesCustomerGroups.php b/src/Contracts/Utility/RetrievesCustomerGroups.php
new file mode 100644
index 0000000..5338dc3
--- /dev/null
+++ b/src/Contracts/Utility/RetrievesCustomerGroups.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Contracts\Utility;
+
+interface RetrievesCustomerGroups
+{
+    public function retrieve(): array;
+}
diff --git a/src/Data/BasePriceData.php b/src/Data/BasePriceData.php
deleted file mode 100644
index e77e3dc..0000000
--- a/src/Data/BasePriceData.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Data;
-
-use Brick\Money\Money;
-use Illuminate\Contracts\Support\Arrayable;
-use JustBetter\MagentoPrices\Helpers\MoneyHelper;
-
-class BasePriceData implements Arrayable
-{
-    public Money $price;
-
-    public int $storeId = 0;
-
-    public function __construct(Money $price, int $storeId = 0)
-    {
-        $this->price = $price;
-        $this->storeId = $storeId;
-    }
-
-    public function getStoreId(): int
-    {
-        return $this->storeId;
-    }
-
-    public function setStoreId(int $storeId): void
-    {
-        $this->storeId = $storeId;
-    }
-
-    public function getPrice(): Money
-    {
-        return $this->price;
-    }
-
-    public function setPrice(Money $price): void
-    {
-        $this->price = $price;
-    }
-
-    public function parsePrice(mixed $price): static
-    {
-        /** @var MoneyHelper $helper */
-        $helper = app(MoneyHelper::class);
-        $this->price = $helper->getMoney($price);
-
-        return $this;
-    }
-
-    public function equals(self $other): bool
-    {
-        return $this->price->isEqualTo($other->price) &&
-            $this->storeId === $other->storeId;
-    }
-
-    public function toArray(): array
-    {
-        return [
-            'storeId' => $this->storeId,
-            'price' => (string) $this->price->getAmount(),
-        ];
-    }
-}
diff --git a/src/Data/Data.php b/src/Data/Data.php
new file mode 100644
index 0000000..69e5667
--- /dev/null
+++ b/src/Data/Data.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Data;
+
+use ArrayAccess;
+use Illuminate\Contracts\Support\Arrayable;
+use JustBetter\MagentoPrices\Concerns\ValidatesData;
+
+abstract class Data implements Arrayable, ArrayAccess
+{
+    use ValidatesData;
+
+    final public function __construct(
+        public array $data
+    ) {
+        $this->validate($data);
+    }
+
+    public function offsetExists(mixed $offset): bool
+    {
+        return array_key_exists($offset, $this->data);
+    }
+
+    public function offsetGet(mixed $offset): mixed
+    {
+        return $this->data[$offset] ?? null;
+    }
+
+    public function offsetSet(mixed $offset, mixed $value): void
+    {
+        $this->data[$offset] = $value;
+    }
+
+    public function offsetUnset(mixed $offset): void
+    {
+        unset($this->data[$offset]);
+    }
+
+    public static function of(array $data): static
+    {
+        return new static($data);
+    }
+
+    public function toArray(): array
+    {
+        return $this->data;
+    }
+}
diff --git a/src/Data/PriceData.php b/src/Data/PriceData.php
index 67b5a2b..ebc9dc8 100644
--- a/src/Data/PriceData.php
+++ b/src/Data/PriceData.php
@@ -2,121 +2,35 @@
 
 namespace JustBetter\MagentoPrices\Data;
 
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Support\Collection;
-use JustBetter\MagentoPrices\Actions\CheckTierDuplicates;
-use JustBetter\MagentoPrices\Contracts\DeterminesPricesEqual;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-
-class PriceData implements Arrayable
+class PriceData extends Data
 {
-    public string $sku;
-
-    /** @var Collection<int, BasePriceData> */
-    public Collection $basePrices;
-
-    /** @var Collection<int, TierPriceData> */
-    public Collection $tierPrices;
-
-    /** @var Collection<int, SpecialPriceData> */
-    public Collection $specialPrices;
-
-    public function __construct(
-        string $sku,
-        Collection $basePrices,
-        ?Collection $tierPrices = null,
-        ?Collection $specialPrices = null
-    ) {
-        $this->sku = $sku;
-        $this->basePrices = $basePrices;
-        $this->tierPrices = $tierPrices ?? collect();
-        $this->specialPrices = $specialPrices ?? collect();
-    }
-
-    public function toArray(): array
-    {
-        return [
-            'base_prices' => $this->basePrices->map(fn (BasePriceData $data) => $data->toArray()),
-            'tier_prices' => $this->tierPrices->map(fn (TierPriceData $data) => $data->toArray()),
-            'special_prices' => $this->specialPrices->map(fn (SpecialPriceData $data) => $data->toArray()),
-        ];
-    }
-
-    public function getMagentoBasePrices(): array
-    {
-        $magentoPrices = [];
-
-        /** @var BasePriceData $basePrice */
-        foreach ($this->basePrices as $basePrice) {
-            $magentoPrices[] = [
-                'sku' => $this->sku,
-                'price' => $basePrice->getPrice()->getAmount()->toFloat(),
-                'store_id' => $basePrice->getStoreId(),
-            ];
-        }
-
-        return $magentoPrices;
-    }
-
-    public function getMagentoTierPrices(): array
-    {
-        $magentoPrices = [];
-
-        /** @var TierPriceData $tierPrice */
-        foreach ($this->tierPrices as $tierPrice) {
-            $magentoPrices[] = [
-                'sku' => $this->sku,
-                'price' => $tierPrice->getPrice()->getAmount()->toFloat(),
-                'website_id' => $tierPrice->getStoreId(),
-                'quantity' => $tierPrice->getQuantity() < 1 ? 1 : $tierPrice->getQuantity(),
-                'customer_group' => $tierPrice->getGroupId(),
-                'price_type' => $tierPrice->getPriceType(),
-            ];
-        }
-
-        return $magentoPrices;
-    }
-
-    public function getMagentoSpecialPrices(): array
-    {
-        $magentoPrices = [];
-
-        /** @var SpecialPriceData $specialPrice */
-        foreach ($this->specialPrices as $specialPrice) {
-            $magentoPrices[] = [
-                'sku' => $this->sku,
-                'price' => $specialPrice->getPrice()->getAmount()->toFloat(),
-                'store_id' => $specialPrice->getStoreId(),
-                'price_from' => $specialPrice->getFrom()->format('Y-m-d H:i:s'),
-                'price_to' => $specialPrice->getTo()->format('Y-m-d H:i:s'),
-            ];
-        }
-
-        return $magentoPrices;
-    }
-
-    public function getModel(): MagentoPrice
-    {
-        /** @var MagentoPrice $price */
-        $price = MagentoPrice::query()
-            ->firstOrCreate(['sku' => $this->sku]);
-
-        return $price;
-    }
-
-    public function equals(self $other): bool
+    public array $rules = [
+        'sku' => ['required', 'max:255'],
+
+        'base_prices' => ['nullable', 'array'],
+        'base_prices.*.store_id' => ['required', 'integer'],
+        'base_prices.*.price' => ['required', 'numeric'],
+
+        'tier_prices' => ['nullable', 'array'],
+        'tier_prices.*.website_id' => ['required', 'integer'],
+        'tier_prices.*.customer_group' => ['required', 'string'],
+        'tier_prices.*.price_type' => ['required', 'string'],
+        'tier_prices.*.quantity' => ['required', 'numeric'],
+        'tier_prices.*.price' => ['required', 'numeric'],
+
+        'special_prices' => ['nullable', 'array'],
+        'special_prices.*.store_id' => ['required', 'integer'],
+        'special_prices.*.price' => ['required', 'numeric'],
+        'special_prices.*.price_from' => ['required', 'string'],
+        'special_prices.*.price_to' => ['required', 'string'],
+    ];
+
+    public function checksum(): string
     {
-        /** @var DeterminesPricesEqual $check */
-        $check = app(DeterminesPricesEqual::class);
-
-        return $check->equals($this, $other);
-    }
+        $json = json_encode($this->validated());
 
-    public function validate(): void
-    {
-        /** @var CheckTierDuplicates $tierDuplicates */
-        $tierDuplicates = app(CheckTierDuplicates::class);
+        throw_if($json === false, 'Failed to generate checksum');
 
-        $tierDuplicates->check($this->sku, $this->tierPrices);
+        return md5($json);
     }
 }
diff --git a/src/Data/SpecialPriceData.php b/src/Data/SpecialPriceData.php
deleted file mode 100644
index 1333825..0000000
--- a/src/Data/SpecialPriceData.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Data;
-
-use Brick\Money\Money;
-use Carbon\Carbon;
-use Illuminate\Contracts\Support\Arrayable;
-use JustBetter\MagentoPrices\Helpers\MoneyHelper;
-
-class SpecialPriceData implements Arrayable
-{
-    public Money $price;
-
-    public int $storeId = 0;
-
-    public Carbon $from;
-
-    public Carbon $to;
-
-    public function __construct(Money $price, int $storeId = 0, ?Carbon $from = null, ?Carbon $to = null)
-    {
-        $this->price = $price;
-        $this->storeId = $storeId;
-        $this->from = $from ?? Carbon::createFromTimestamp(0);
-        $this->to = $to ?? Carbon::createFromTimestamp(2147483647);
-    }
-
-    public function getStoreId(): int
-    {
-        return $this->storeId;
-    }
-
-    public function setStoreId(int $storeId): void
-    {
-        $this->storeId = $storeId;
-    }
-
-    public function getPrice(): Money
-    {
-        return $this->price;
-    }
-
-    public function setPrice(Money $price): void
-    {
-        $this->price = $price;
-    }
-
-    public function getFrom(): Carbon
-    {
-        return $this->from;
-    }
-
-    public function setFrom(Carbon $from): void
-    {
-        $this->from = $from;
-    }
-
-    public function getTo(): Carbon
-    {
-        return $this->to;
-    }
-
-    public function setTo(Carbon $to): void
-    {
-        $this->to = $to;
-    }
-
-    public function parsePrice(mixed $price): self
-    {
-        /** @var MoneyHelper $helper */
-        $helper = app(MoneyHelper::class);
-        $this->price = $helper->getMoney($price);
-
-        return $this;
-    }
-
-    public function equals(self $other): bool
-    {
-        if (! $this->price->isEqualTo($other->price)) {
-            return false;
-        }
-
-        if (! $this->from->startOfDay()->equalTo($other->from->startOfDay()) || ! $this->to->startOfDay()->equalTo($other->to->startOfDay())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    public function toArray(): array
-    {
-        return [
-            'storeId' => $this->storeId,
-            'price' => (string) $this->price->getAmount(),
-            'price_from' => $this->from->format('Y-m-d H:i:s'),
-            'price_to' => $this->to->format('Y-m-d H:i:s'),
-        ];
-    }
-}
diff --git a/src/Data/TierPriceData.php b/src/Data/TierPriceData.php
deleted file mode 100644
index 666406f..0000000
--- a/src/Data/TierPriceData.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Data;
-
-use Brick\Money\Money;
-use Illuminate\Contracts\Support\Arrayable;
-
-class TierPriceData implements Arrayable
-{
-    public int $storeId;
-
-    public int $quantity;
-
-    public string $groupId;
-
-    public string $priceType;
-
-    public Money $price;
-
-    public function __construct(
-        string $groupId,
-        Money $price,
-        int $quantity = 1,
-        int $storeId = 0,
-        string $priceType = 'fixed'
-    ) {
-        $this->groupId = $groupId;
-        $this->price = $price;
-        $this->quantity = $quantity;
-        $this->storeId = $storeId;
-        $this->priceType = $priceType;
-    }
-
-    public function getPriceType(): string
-    {
-        return $this->priceType;
-    }
-
-    public function setPriceType(string $priceType): void
-    {
-        $this->priceType = $priceType;
-    }
-
-    public function getStoreId(): int
-    {
-        return $this->storeId;
-    }
-
-    public function setStoreId(int $storeId): void
-    {
-        $this->storeId = $storeId;
-    }
-
-    public function getQuantity(): int
-    {
-        return $this->quantity;
-    }
-
-    public function setQuantity(int $quantity): void
-    {
-        $this->quantity = $quantity;
-    }
-
-    public function getPrice(): Money
-    {
-        return $this->price;
-    }
-
-    public function setPrice(Money $price): void
-    {
-        $this->price = $price;
-    }
-
-    public function getGroupId(): string
-    {
-        return $this->groupId;
-    }
-
-    public function setGroupId(string $groupId): void
-    {
-        $this->groupId = $groupId;
-    }
-
-    /** Get unique identifier for this store, qty and group */
-    public function getIdentifier(): string
-    {
-        return implode('-', [$this->storeId, $this->quantity, $this->groupId]);
-    }
-
-    public function equals(self $other): bool
-    {
-        return $this->price->isEqualTo($other->price) &&
-            $this->groupId === $other->groupId &&
-            $this->storeId === $other->storeId &&
-            $this->priceType === $other->priceType;
-    }
-
-    public function toArray(): array
-    {
-        return [
-            'storeId' => $this->storeId,
-            'quantity' => $this->quantity,
-            'customer_group' => $this->groupId,
-            'price' => (string) $this->price->getAmount(),
-        ];
-    }
-}
diff --git a/src/Events/LongWaitDetectedEvent.php b/src/Events/LongWaitDetectedEvent.php
deleted file mode 100644
index 048a7d9..0000000
--- a/src/Events/LongWaitDetectedEvent.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Events;
-
-use Illuminate\Foundation\Events\Dispatchable;
-
-class LongWaitDetectedEvent
-{
-    use Dispatchable;
-
-    public function __construct(public string $type, public int $wait)
-    {
-    }
-}
diff --git a/src/Events/UpdatedPriceEvent.php b/src/Events/UpdatedPriceEvent.php
index c921764..5f02c1d 100644
--- a/src/Events/UpdatedPriceEvent.php
+++ b/src/Events/UpdatedPriceEvent.php
@@ -3,12 +3,11 @@
 namespace JustBetter\MagentoPrices\Events;
 
 use Illuminate\Foundation\Events\Dispatchable;
+use JustBetter\MagentoPrices\Models\Price;
 
 class UpdatedPriceEvent
 {
     use Dispatchable;
 
-    public function __construct(public string $sku)
-    {
-    }
+    public function __construct(public Price $price) {}
 }
diff --git a/src/Exceptions/DuplicateTierPriceException.php b/src/Exceptions/DuplicateTierPriceException.php
index 8eb0124..554c3c3 100644
--- a/src/Exceptions/DuplicateTierPriceException.php
+++ b/src/Exceptions/DuplicateTierPriceException.php
@@ -3,18 +3,5 @@
 namespace JustBetter\MagentoPrices\Exceptions;
 
 use Exception;
-use Illuminate\Support\Collection;
 
-class DuplicateTierPriceException extends Exception
-{
-    public function __construct(string $sku, Collection $tierPrices)
-    {
-        $message = "Found duplicate tier prices for $sku:".PHP_EOL;
-
-        foreach ($tierPrices as $tier) {
-            $message .= "Store: $tier->storeId, Group: $tier->groupId, Qty: $tier->quantity.".PHP_EOL;
-        }
-
-        parent::__construct($message);
-    }
-}
+class DuplicateTierPriceException extends Exception {}
diff --git a/src/Exceptions/NotSupportedException.php b/src/Exceptions/NotImplementedException.php
similarity index 58%
rename from src/Exceptions/NotSupportedException.php
rename to src/Exceptions/NotImplementedException.php
index badea83..f273a49 100644
--- a/src/Exceptions/NotSupportedException.php
+++ b/src/Exceptions/NotImplementedException.php
@@ -4,6 +4,4 @@
 
 use Exception;
 
-class NotSupportedException extends Exception
-{
-}
+class NotImplementedException extends Exception {}
diff --git a/src/Exceptions/PriceUpdateException.php b/src/Exceptions/PriceUpdateException.php
index fa5aad1..00d11e7 100644
--- a/src/Exceptions/PriceUpdateException.php
+++ b/src/Exceptions/PriceUpdateException.php
@@ -4,6 +4,4 @@
 
 use Exception;
 
-class PriceUpdateException extends Exception
-{
-}
+class PriceUpdateException extends Exception {}
diff --git a/src/Helpers/MoneyHelper.php b/src/Helpers/MoneyHelper.php
deleted file mode 100644
index 8d1f409..0000000
--- a/src/Helpers/MoneyHelper.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Helpers;
-
-use Brick\Money\Context\CustomContext;
-use Brick\Money\Money;
-
-class MoneyHelper
-{
-    public function getMoney(mixed $amount, string $method = 'of'): Money
-    {
-        return Money::$method(
-            $amount,
-            config('magento-prices.currency'),
-            new CustomContext(config('magento-prices.precision')),
-            config('magento-prices.rounding_mode')
-        );
-    }
-}
diff --git a/src/Jobs/MonitorWaitTimesJob.php b/src/Jobs/ProcessPricesJob.php
similarity index 61%
rename from src/Jobs/MonitorWaitTimesJob.php
rename to src/Jobs/ProcessPricesJob.php
index 62bbe32..9c385e5 100644
--- a/src/Jobs/MonitorWaitTimesJob.php
+++ b/src/Jobs/ProcessPricesJob.php
@@ -7,23 +7,21 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use JustBetter\MagentoPrices\Contracts\MonitorsWaitTimes;
+use JustBetter\MagentoPrices\Contracts\ProcessesPrices;
 
-class MonitorWaitTimesJob implements ShouldBeUnique, ShouldQueue
+class ProcessPricesJob implements ShouldBeUnique, ShouldQueue
 {
     use Dispatchable;
     use InteractsWithQueue;
     use Queueable;
-    use SerializesModels;
 
     public function __construct()
     {
         $this->onQueue(config('magento-prices.queue'));
     }
 
-    public function handle(MonitorsWaitTimes $waitTimes): void
+    public function handle(ProcessesPrices $prices): void
     {
-        $waitTimes->monitor();
+        $prices->process();
     }
 }
diff --git a/src/Jobs/Retrieval/RetrieveAllPricesJob.php b/src/Jobs/Retrieval/RetrieveAllPricesJob.php
new file mode 100644
index 0000000..baf48b9
--- /dev/null
+++ b/src/Jobs/Retrieval/RetrieveAllPricesJob.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Jobs\Retrieval;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Support\Carbon;
+use JustBetter\MagentoPrices\Contracts\Retrieval\RetrievesAllPrices;
+
+class RetrieveAllPricesJob implements ShouldBeUnique, ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+
+    public function __construct(public ?Carbon $from = null)
+    {
+        $this->onQueue(config('magento-prices.queue'));
+    }
+
+    public function handle(RetrievesAllPrices $prices): void
+    {
+        $prices->retrieve($this->from);
+    }
+}
diff --git a/src/Jobs/Retrieval/RetrievePriceJob.php b/src/Jobs/Retrieval/RetrievePriceJob.php
new file mode 100644
index 0000000..8150768
--- /dev/null
+++ b/src/Jobs/Retrieval/RetrievePriceJob.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Jobs\Retrieval;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use JustBetter\MagentoPrices\Contracts\Retrieval\RetrievesPrice;
+use JustBetter\MagentoPrices\Models\Price;
+use Spatie\Activitylog\ActivityLogger;
+use Throwable;
+
+class RetrievePriceJob implements ShouldBeUnique, ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+
+    public function __construct(
+        public string $sku,
+        public bool $forceUpdate = false
+    ) {
+        $this->onQueue(config('magento-prices.queue'));
+    }
+
+    public function handle(RetrievesPrice $price): void
+    {
+        $price->retrieve($this->sku, $this->forceUpdate);
+    }
+
+    public function uniqueId(): string
+    {
+        return $this->sku;
+    }
+
+    public function tags(): array
+    {
+        return [
+            $this->sku,
+        ];
+    }
+
+    /** @codeCoverageIgnore */
+    public function failed(Throwable $exception): void
+    {
+        /** @var ?Price $model */
+        $model = Price::query()->firstWhere('sku', '=', $this->sku);
+
+        activity()
+            ->when($model, function (ActivityLogger $logger, Price $price): ActivityLogger {
+                return $logger->on($price);
+            })
+            ->useLog('error')
+            ->log('Failed to retrieve price: '.$exception->getMessage());
+    }
+}
diff --git a/src/Jobs/Retrieval/SavePriceJob.php b/src/Jobs/Retrieval/SavePriceJob.php
new file mode 100644
index 0000000..e5f6d01
--- /dev/null
+++ b/src/Jobs/Retrieval/SavePriceJob.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Jobs\Retrieval;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use JustBetter\MagentoPrices\Contracts\Retrieval\SavesPrice;
+use JustBetter\MagentoPrices\Data\PriceData;
+use JustBetter\MagentoPrices\Models\Price;
+use Spatie\Activitylog\ActivityLogger;
+use Throwable;
+
+class SavePriceJob implements ShouldBeUnique, ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+
+    public function __construct(
+        public PriceData $data,
+        public bool $forceUpdate
+    ) {
+        $this->onQueue(config('magento-prices.queue'));
+    }
+
+    public function handle(SavesPrice $price): void
+    {
+        $price->save($this->data, $this->forceUpdate);
+    }
+
+    public function uniqueId(): string
+    {
+        return $this->data['sku'];
+    }
+
+    public function tags(): array
+    {
+        return [
+            $this->data['sku'],
+        ];
+    }
+
+    /** @codeCoverageIgnore */
+    public function failed(Throwable $exception): void
+    {
+        /** @var ?Price $model */
+        $model = Price::query()->firstWhere('sku', '=', $this->data['sku']);
+
+        activity()
+            ->when($model, function (ActivityLogger $logger, Price $price): ActivityLogger {
+                return $logger->on($price);
+            })
+            ->useLog('error')
+            ->log('Failed to save price: '.$exception->getMessage());
+    }
+}
diff --git a/src/Jobs/RetrievePriceJob.php b/src/Jobs/RetrievePriceJob.php
deleted file mode 100644
index cd9bae5..0000000
--- a/src/Jobs/RetrievePriceJob.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Jobs;
-
-use Illuminate\Bus\Batchable;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use JustBetter\MagentoPrices\Contracts\RetrievesPrice;
-
-class RetrievePriceJob implements ShouldBeUnique, ShouldQueue
-{
-    use Batchable;
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    public function __construct(
-        public string $sku,
-        protected bool $forceUpdate = false
-    ) {
-        $this->onQueue(config('magento-prices.queue'));
-    }
-
-    public function handle(): void
-    {
-        /** @var RetrievesPrice $retriever */
-        $retriever = app(config('magento-prices.retrievers.price'));
-
-        $price = $retriever->retrieve($this->sku);
-
-        if ($price === null) {
-            return;
-        }
-
-        ProcessPriceJob::dispatch($price, $this->forceUpdate);
-    }
-
-    public function uniqueId(): string
-    {
-        return $this->sku;
-    }
-
-    public function tags(): array
-    {
-        return [
-            $this->sku,
-            'force:'.($this->forceUpdate ? 'true' : 'false'),
-        ];
-    }
-}
diff --git a/src/Jobs/RetrievePricesJob.php b/src/Jobs/RetrievePricesJob.php
deleted file mode 100644
index 4c48a17..0000000
--- a/src/Jobs/RetrievePricesJob.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Jobs;
-
-use DateTime;
-use Illuminate\Bus\Batchable;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Carbon;
-use JustBetter\MagentoPrices\Contracts\RetrievesSkus;
-
-class RetrievePricesJob implements ShouldQueue
-{
-    use Batchable;
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    public function __construct(
-        protected ?Carbon $from = null,
-        protected bool $forceUpdate = false
-    ) {
-        $this->onQueue(config('magento-prices.queue'));
-    }
-
-    public function handle(): void
-    {
-        /** @var RetrievesSkus $retriever */
-        $retriever = app(config('magento-prices.retrievers.sku'));
-
-        $prices = $this->hasFromDate()
-            ? $retriever->retrieveByDate($this->from)
-            : $retriever->retrieveAll();
-
-        $prices->each(fn (string $sku) => RetrievePriceJob::dispatch($sku));
-    }
-
-    protected function hasFromDate(): bool
-    {
-        return $this->from !== null && is_a($this->from, DateTime::class);
-    }
-
-    public function tags(): array
-    {
-        return [
-            'force:'.($this->forceUpdate ? 'true' : 'false'),
-            $this->hasFromDate() ? 'from:'.$this->from->toDateTimeString() : 'all',
-        ];
-    }
-}
diff --git a/src/Jobs/SyncMissingPricesJob.php b/src/Jobs/SyncMissingPricesJob.php
deleted file mode 100644
index ae200f8..0000000
--- a/src/Jobs/SyncMissingPricesJob.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Jobs;
-
-use Illuminate\Bus\Batchable;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use JustBetter\MagentoPrices\Contracts\FindsProductsWithMissingPrices;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-
-class SyncMissingPricesJob implements ShouldBeUnique, ShouldQueue
-{
-    use Batchable;
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    public int $timeout = 1800;
-
-    public function __construct()
-    {
-        $this->queue = config('magento-prices.queue');
-    }
-
-    public function handle(FindsProductsWithMissingPrices $findsProductsWithMissingPrices): void
-    {
-        $products = $findsProductsWithMissingPrices->retrieve();
-
-        foreach ($products as $sku) {
-            $price = MagentoPrice::findBySku($sku);
-
-            if ($price !== null) {
-                UpdatePriceJob::dispatch($sku);
-
-                continue;
-            }
-
-            RetrievePriceJob::dispatch($sku);
-        }
-    }
-}
diff --git a/src/Jobs/SyncPricesJob.php b/src/Jobs/SyncPricesJob.php
deleted file mode 100644
index 7349b50..0000000
--- a/src/Jobs/SyncPricesJob.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Jobs;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use JustBetter\MagentoPrices\Contracts\SyncsPrices;
-
-class SyncPricesJob implements ShouldBeUnique, ShouldQueue
-{
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    public function __construct(protected ?int $retrieveLimit = null, protected ?int $updateLimit = null)
-    {
-        $this->onQueue(config('magento-prices.queue'));
-    }
-
-    public function handle(SyncsPrices $syncsPrices): void
-    {
-        $syncsPrices->sync($this->retrieveLimit, $this->updateLimit);
-    }
-}
diff --git a/src/Jobs/ProcessPriceJob.php b/src/Jobs/Update/UpdatePriceJob.php
similarity index 52%
rename from src/Jobs/ProcessPriceJob.php
rename to src/Jobs/Update/UpdatePriceJob.php
index b0ebe09..fbbe934 100644
--- a/src/Jobs/ProcessPriceJob.php
+++ b/src/Jobs/Update/UpdatePriceJob.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace JustBetter\MagentoPrices\Jobs;
+namespace JustBetter\MagentoPrices\Jobs\Update;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
@@ -8,29 +8,29 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use JustBetter\MagentoPrices\Contracts\ProcessesPrice;
-use JustBetter\MagentoPrices\Data\PriceData;
+use JustBetter\MagentoPrices\Contracts\Update\Sync\UpdatesPrice;
+use JustBetter\MagentoPrices\Models\Price;
 
-class ProcessPriceJob implements ShouldBeUnique, ShouldQueue
+class UpdatePriceJob implements ShouldBeUnique, ShouldQueue
 {
     use Dispatchable;
     use InteractsWithQueue;
     use Queueable;
     use SerializesModels;
 
-    public function __construct(protected PriceData $price, protected bool $forceUpdate = false)
+    public function __construct(public Price $price)
     {
         $this->onQueue(config('magento-prices.queue'));
     }
 
-    public function handle(ProcessesPrice $processesPrice): void
+    public function handle(UpdatesPrice $contract): void
     {
-        $processesPrice->process($this->price, $this->forceUpdate);
+        $contract->update($this->price);
     }
 
-    public function uniqueId(): string
+    public function uniqueId(): int
     {
-        return $this->price->sku;
+        return $this->price->id;
     }
 
     public function tags(): array
diff --git a/src/Jobs/Update/UpdatePricesAsyncJob.php b/src/Jobs/Update/UpdatePricesAsyncJob.php
new file mode 100644
index 0000000..c9ceda2
--- /dev/null
+++ b/src/Jobs/Update/UpdatePricesAsyncJob.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Jobs\Update;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Collection;
+use JustBetter\MagentoPrices\Contracts\Update\Async\UpdatesPricesAsync;
+use JustBetter\MagentoPrices\Models\Price;
+
+class UpdatePricesAsyncJob implements ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+    use SerializesModels;
+
+    /** @param Collection<int, Price> $prices */
+    public function __construct(public Collection $prices)
+    {
+        $this->onQueue(config('magento-prices.queue'));
+    }
+
+    public function handle(UpdatesPricesAsync $contract): void
+    {
+        $contract->update($this->prices);
+    }
+
+    public function tags(): array
+    {
+        return $this->prices->pluck('sku')->toArray();
+    }
+}
diff --git a/src/Jobs/UpdateMagentoBasePricesJob.php b/src/Jobs/UpdateMagentoBasePricesJob.php
deleted file mode 100644
index ae04eef..0000000
--- a/src/Jobs/UpdateMagentoBasePricesJob.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Jobs;
-
-use Illuminate\Bus\Batchable;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Http\Client\RequestException;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use JustBetter\MagentoPrices\Contracts\UpdatesMagentoBasePrice;
-use JustBetter\MagentoPrices\Data\PriceData;
-use Throwable;
-
-class UpdateMagentoBasePricesJob implements ShouldBeUnique, ShouldQueue
-{
-    use Batchable;
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    public int $tries = 3;
-
-    public int $backoff = 120;
-
-    public function __construct(protected PriceData $price)
-    {
-        $this->onQueue(config('magento-prices.queue'));
-    }
-
-    public function handle(UpdatesMagentoBasePrice $magentoBasePrice): void
-    {
-        $magentoBasePrice->update($this->price);
-    }
-
-    public function failed(Throwable $exception): void
-    {
-        if (is_a($exception, RequestException::class)) {
-            $response = $exception->response->body();
-        }
-
-        activity()
-            ->on($this->price->getModel())
-            ->useLog('error')
-            ->withProperties([
-                'priceData' => $this->price->getMagentoBasePrices(),
-                'message' => $exception->getMessage(),
-                'response' => $response ?? '',
-            ])
-            ->log('Failed to update base prices');
-
-        $this->price->getModel()->registerError();
-    }
-
-    public function uniqueId(): string
-    {
-        return $this->price->sku;
-    }
-
-    public function tags(): array
-    {
-        return [
-            $this->price->sku,
-        ];
-    }
-}
diff --git a/src/Jobs/UpdateMagentoSpecialPricesJob.php b/src/Jobs/UpdateMagentoSpecialPricesJob.php
deleted file mode 100644
index bd305e6..0000000
--- a/src/Jobs/UpdateMagentoSpecialPricesJob.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Jobs;
-
-use Illuminate\Bus\Batchable;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Http\Client\RequestException;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use JustBetter\MagentoPrices\Contracts\UpdatesMagentoSpecialPrice;
-use JustBetter\MagentoPrices\Data\PriceData;
-use Throwable;
-
-class UpdateMagentoSpecialPricesJob implements ShouldBeUnique, ShouldQueue
-{
-    use Batchable;
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    public int $tries = 3;
-
-    public int $backoff = 120;
-
-    public function __construct(protected PriceData $price)
-    {
-        $this->onQueue(config('magento-prices.queue'));
-    }
-
-    public function handle(UpdatesMagentoSpecialPrice $updatesMagentoSpecialPrice): void
-    {
-        $updatesMagentoSpecialPrice->update($this->price);
-    }
-
-    public function failed(Throwable $exception): void
-    {
-        if (is_a($exception, RequestException::class)) {
-            $response = $exception->response->body();
-        }
-
-        activity()
-            ->on($this->price->getModel())
-            ->useLog('error')
-            ->withProperties([
-                'priceData' => $this->price->getMagentoBasePrices(),
-                'message' => $exception->getMessage(),
-                'response' => $response ?? '',
-            ])
-            ->log('Failed to update special prices');
-
-        $this->price->getModel()->registerError();
-    }
-
-    public function uniqueId(): string
-    {
-        return $this->price->sku;
-    }
-
-    public function tags(): array
-    {
-        return [
-            $this->price->sku,
-        ];
-    }
-}
diff --git a/src/Jobs/UpdateMagentoTierPricesJob.php b/src/Jobs/UpdateMagentoTierPricesJob.php
deleted file mode 100644
index e6615f7..0000000
--- a/src/Jobs/UpdateMagentoTierPricesJob.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Jobs;
-
-use Illuminate\Bus\Batchable;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Http\Client\RequestException;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use JustBetter\MagentoPrices\Contracts\UpdatesMagentoTierPrice;
-use JustBetter\MagentoPrices\Data\PriceData;
-use Throwable;
-
-class UpdateMagentoTierPricesJob implements ShouldBeUnique, ShouldQueue
-{
-    use Batchable;
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    public int $tries = 3;
-
-    public int $backoff = 120;
-
-    public function __construct(protected PriceData $price)
-    {
-        $this->onQueue(config('magento-prices.queue'));
-    }
-
-    public function handle(UpdatesMagentoTierPrice $updatesMagentoTierPrice): void
-    {
-        $updatesMagentoTierPrice->update($this->price);
-    }
-
-    public function failed(Throwable $exception): void
-    {
-        if (is_a($exception, RequestException::class)) {
-            $response = $exception->response->body();
-        }
-
-        activity()
-            ->on($this->price->getModel())
-            ->useLog('error')
-            ->withProperties([
-                'priceData' => $this->price->getMagentoBasePrices(),
-                'message' => $exception->getMessage(),
-                'response' => $response ?? '',
-            ])
-            ->log('Failed to update tier prices');
-
-        $this->price->getModel()->registerError();
-    }
-
-    public function uniqueId(): string
-    {
-        return $this->price->sku;
-    }
-
-    public function tags(): array
-    {
-        return [
-            $this->price->sku,
-        ];
-    }
-}
diff --git a/src/Jobs/UpdatePriceJob.php b/src/Jobs/UpdatePriceJob.php
deleted file mode 100644
index b9a5689..0000000
--- a/src/Jobs/UpdatePriceJob.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Jobs;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Bus;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Events\UpdatedPriceEvent;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-use JustBetter\MagentoProducts\Contracts\ChecksMagentoExistence;
-
-class UpdatePriceJob implements ShouldBeUnique, ShouldQueue
-{
-    use Dispatchable;
-    use InteractsWithQueue;
-    use Queueable;
-    use SerializesModels;
-
-    public function __construct(
-        public string $sku,
-        protected ?string $type = null,
-    ) {
-        $this->queue = config('magento-prices.queue');
-    }
-
-    public function handle(ChecksMagentoExistence $checksMagentoExistence): void
-    {
-        $model = MagentoPrice::findBySku($this->sku);
-
-        if ($model === null) {
-            return;
-        }
-
-        if (! $checksMagentoExistence->exists($model->sku)) {
-            $model->update([
-                'update' => false,
-                'sync' => false,
-            ]);
-
-            return;
-        }
-
-        $data = $model->getData();
-
-        Bus::batch(array_filter([
-            $this->handleBasePrices($data),
-            $this->handleTierPrices($data),
-            $this->handleSpecialPrices($data),
-        ]))
-            ->name("Magento price update $this->sku")
-            ->onQueue(config('magento-prices.queue'))
-            ->then(function () use ($model): void {
-                $model->update([
-                    'fail_count' => 0,
-                    'last_failed' => null,
-                ]);
-            })
-            ->dispatch();
-
-        $model->update([
-            'update' => false,
-        ]);
-
-        UpdatedPriceEvent::dispatch($this->sku);
-    }
-
-    protected function handleBasePrices(PriceData $data): ?UpdateMagentoBasePricesJob
-    {
-        if ($this->shouldUpdateType('base') && $data->basePrices->isNotEmpty()) {
-            return new UpdateMagentoBasePricesJob($data);
-        }
-
-        return null;
-    }
-
-    protected function handleTierPrices(PriceData $data): ?UpdateMagentoTierPricesJob
-    {
-        if ($this->shouldUpdateType('tier') && $data->tierPrices->isNotEmpty()) {
-            $data->getModel()->update([
-                'has_tier' => true,
-            ]);
-
-            return new UpdateMagentoTierPricesJob($data);
-        }
-
-        // Delete the tier price
-        if ($data->getModel()->has_tier) {
-            $data->getModel()->update([
-                'has_tier' => false,
-            ]);
-
-            return new UpdateMagentoTierPricesJob($data);
-        }
-
-        return null;
-    }
-
-    protected function handleSpecialPrices(PriceData $data): ?UpdateMagentoSpecialPricesJob
-    {
-        if ($this->shouldUpdateType('special') && $data->specialPrices->isNotEmpty()) {
-            $data->getModel()->update([
-                'has_special' => true,
-            ]);
-
-            return new UpdateMagentoSpecialPricesJob($data);
-        }
-
-        // Delete the special price
-        if ($data->getModel()->has_special) {
-            $data->getModel()->update([
-                'has_special' => false,
-            ]);
-
-            return new UpdateMagentoSpecialPricesJob($data);
-        }
-
-        return null;
-    }
-
-    protected function shouldUpdateType(string $type): bool
-    {
-        return blank($this->type) || $type == $this->type;
-    }
-
-    public function uniqueId(): string
-    {
-        return $this->sku;
-    }
-
-    public function tags(): array
-    {
-        return [
-            $this->sku,
-            'type:'.($this->type ?? 'all'),
-        ];
-    }
-}
diff --git a/src/Jobs/ImportCustomerGroupsJob.php b/src/Jobs/Utility/ImportCustomerGroupsJob.php
similarity index 82%
rename from src/Jobs/ImportCustomerGroupsJob.php
rename to src/Jobs/Utility/ImportCustomerGroupsJob.php
index 544ab48..9b8b9b9 100644
--- a/src/Jobs/ImportCustomerGroupsJob.php
+++ b/src/Jobs/Utility/ImportCustomerGroupsJob.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace JustBetter\MagentoPrices\Jobs;
+namespace JustBetter\MagentoPrices\Jobs\Utility;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
-use JustBetter\MagentoPrices\Contracts\ImportsCustomerGroups;
+use JustBetter\MagentoPrices\Contracts\Utility\ImportsCustomerGroups;
 
 class ImportCustomerGroupsJob implements ShouldBeUnique, ShouldQueue
 {
diff --git a/src/Jobs/Utility/ProcessProductsWithMissingPricesJob.php b/src/Jobs/Utility/ProcessProductsWithMissingPricesJob.php
new file mode 100644
index 0000000..3c393af
--- /dev/null
+++ b/src/Jobs/Utility/ProcessProductsWithMissingPricesJob.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Jobs\Utility;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldBeUnique;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use JustBetter\MagentoPrices\Contracts\Utility\ProcessesProductsWithMissingPrices;
+
+class ProcessProductsWithMissingPricesJob implements ShouldBeUnique, ShouldQueue
+{
+    use Dispatchable;
+    use InteractsWithQueue;
+    use Queueable;
+
+    public function __construct()
+    {
+        $this->onQueue(config('magento-prices.queue'));
+    }
+
+    public function handle(ProcessesProductsWithMissingPrices $contract): void
+    {
+        $contract->process();
+    }
+}
diff --git a/src/Listeners/BulkOperationStatusListener.php b/src/Listeners/BulkOperationStatusListener.php
new file mode 100644
index 0000000..3ffd3e3
--- /dev/null
+++ b/src/Listeners/BulkOperationStatusListener.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Listeners;
+
+use JustBetter\MagentoAsync\Enums\OperationStatus;
+use JustBetter\MagentoAsync\Listeners\BulkOperationStatusListener as BaseBulkOperationStatusListener;
+use JustBetter\MagentoAsync\Models\BulkOperation;
+use JustBetter\MagentoPrices\Events\UpdatedPriceEvent;
+use JustBetter\MagentoPrices\Models\Price;
+
+class BulkOperationStatusListener extends BaseBulkOperationStatusListener
+{
+    protected string $model = Price::class;
+
+    public function execute(BulkOperation $operation): void
+    {
+        /** @var Price $price */
+        $price = $operation->subject;
+
+        if ($operation->status === OperationStatus::Complete) {
+            $price->update(['last_updated' => now()]);
+
+            event(new UpdatedPriceEvent($price));
+
+            return;
+        }
+
+        activity()
+            ->useLog('error')
+            ->withProperties([
+                'status' => $operation->status?->name ?? 'unknown',
+                'response' => $operation->response,
+            ])
+            ->log('Failed to update price');
+    }
+}
diff --git a/src/Models/MagentoCustomerGroup.php b/src/Models/CustomerGroup.php
similarity index 92%
rename from src/Models/MagentoCustomerGroup.php
rename to src/Models/CustomerGroup.php
index abf8de2..df568e1 100644
--- a/src/Models/MagentoCustomerGroup.php
+++ b/src/Models/CustomerGroup.php
@@ -13,7 +13,7 @@
  * @property ?Carbon $created_at
  * @property ?Carbon $updated_at
  */
-class MagentoCustomerGroup extends Model
+class CustomerGroup extends Model
 {
     protected $table = 'magento_prices_customer_groups';
 
diff --git a/src/Models/MagentoPrice.php b/src/Models/MagentoPrice.php
deleted file mode 100644
index a1bfb4e..0000000
--- a/src/Models/MagentoPrice.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Models;
-
-use Carbon\Carbon;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\MorphMany;
-use Illuminate\Support\Collection;
-use JustBetter\MagentoPrices\Data\BasePriceData;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Data\SpecialPriceData;
-use JustBetter\MagentoPrices\Data\TierPriceData;
-use JustBetter\MagentoPrices\Helpers\MoneyHelper;
-use Spatie\Activitylog\ActivitylogServiceProvider;
-use Spatie\Activitylog\LogOptions;
-use Spatie\Activitylog\Traits\LogsActivity;
-
-/**
- * @property int $id
- * @property string $sku
- * @property bool $sync
- * @property ?array $base_prices
- * @property ?array $tier_prices
- * @property bool $has_tier
- * @property ?array $special_prices
- * @property bool $has_special
- * @property bool $retrieve
- * @property bool $update
- * @property ?Carbon $last_retrieved
- * @property ?Carbon $last_updated
- * @property int $fail_count
- * @property ?Carbon $last_failed
- * @property Carbon $created_at
- * @property Carbon $updated_at
- */
-class MagentoPrice extends Model
-{
-    use LogsActivity;
-
-    public $casts = [
-        'last_retrieved' => 'datetime',
-        'last_updated' => 'datetime',
-        'last_failed' => 'datetime',
-        'base_prices' => 'array',
-        'tier_prices' => 'array',
-        'special_prices' => 'array',
-        'sync' => 'boolean',
-        'has_tier' => 'boolean',
-        'has_special' => 'boolean',
-        'retrieve' => 'boolean',
-        'update' => 'boolean',
-    ];
-
-    protected $guarded = [];
-
-    public function scopeShouldRetrieve(Builder $builder): Builder
-    {
-        return $builder
-            ->where('sync', true)
-            ->where('retrieve', true);
-    }
-
-    public function scopeShouldUpdate(Builder $builder): Builder
-    {
-        return $builder
-            ->where('sync', true)
-            ->where('update', true);
-    }
-
-    public function getBasePricesAttribute(?string $value): Collection
-    {
-        /** @var MoneyHelper $helper */
-        $helper = app(MoneyHelper::class);
-
-        $prices = json_decode($value, true) ?? [];
-
-        if (array_key_exists('price', $prices)) {
-            $prices = [$prices];
-        }
-
-        return collect($prices)
-            ->map(fn ($p) => new BasePriceData(
-                $helper->getMoney($p['price']),
-                $p['storeId']
-            ));
-    }
-
-    public function getTierPricesAttribute(?string $value): Collection
-    {
-        /** @var MoneyHelper $helper */
-        $helper = app(MoneyHelper::class);
-
-        $prices = json_decode($value, true) ?? [];
-
-        if (array_key_exists('price', $prices)) {
-            $prices = [$prices];
-        }
-
-        return collect($prices)->map(fn ($p) => new TierPriceData(
-            $p['customer_group'],
-            $helper->getMoney($p['price']),
-            $p['quantity'],
-            $p['storeId'] ?? 0,
-            $p['priceType'] ?? 'fixed',
-        ));
-    }
-
-    public function getSpecialPricesAttribute(?string $value): Collection
-    {
-        /** @var MoneyHelper $helper */
-        $helper = app(MoneyHelper::class);
-
-        $prices = json_decode($value, true) ?? [];
-
-        if (array_key_exists('price', $prices)) {
-            $prices = [$prices];
-        }
-
-        return collect($prices)->map(function ($p) use ($helper) {
-            $from = blank($p['price_from'])
-                ? now()
-                : Carbon::createFromFormat('Y-m-d H:i:s', $p['price_from']);
-
-            $to = blank($p['price_to'])
-                ? now()
-                : Carbon::createFromFormat('Y-m-d H:i:s', $p['price_to']);
-
-            return new SpecialPriceData(
-                $helper->getMoney($p['price']),
-                $p['storeId'],
-                $from,
-                $to
-            );
-        });
-    }
-
-    public function getData(): PriceData
-    {
-        return new PriceData(
-            $this->sku,
-            $this->base_prices,
-            $this->tier_prices,
-            $this->special_prices
-        );
-    }
-
-    public function registerError(): void
-    {
-        $this->fail_count++;
-        $this->last_failed = now();
-
-        if ($this->fail_count > config('magento-prices.fail_count', 5)) {
-            $this->update = false;
-            $this->retrieve = false;
-            $this->fail_count = 0;
-        }
-
-        $this->save();
-    }
-
-    public static function findBySku(string $sku): ?static
-    {
-        /** @var ?static $result */
-        $result = static::query()
-            ->where('sku', $sku)
-            ->first();
-
-        return $result;
-    }
-
-    public function specialPriceChanged(): bool
-    {
-        if (! $this->isDirty('special_prices')) {
-            return false;
-        }
-
-        $original = collect($this->getOriginal('special_prices'));
-        $updated = $this->getAttribute('special_prices');
-
-        if (count($updated) === 0 && $original->isNotEmpty()) {
-            return true;
-        }
-
-        /** @var SpecialPriceData $updatedSpecialPrice */
-        foreach ($updated as $updatedSpecialPrice) {
-            /** @var ?SpecialPriceData $originalPrice */
-            $originalPrice = $original->where('storeId', $updatedSpecialPrice->storeId)->first();
-
-            // Check if a new special price was added
-            if ($originalPrice === null) {
-                return true;
-            }
-
-            // Check if price still is in the date range
-            $dateValid = $originalPrice->from->lessThan(now()) && $originalPrice->to->greaterThan(now());
-
-            if (! $dateValid) {
-                return true;
-            }
-
-            // Check if the price has changed
-            if ($originalPrice->price->compareTo($updatedSpecialPrice->price) !== 0) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function activity(): MorphMany
-    {
-        return $this->morphMany(
-            ActivitylogServiceProvider::determineActivityModel(),
-            'subject'
-        );
-    }
-
-    public function getActivitylogOptions(): LogOptions
-    {
-        return LogOptions::defaults()
-            ->logOnlyDirty()
-            ->dontSubmitEmptyLogs()
-            ->logOnly(['sync', 'base_prices', 'tier_prices', 'special_prices']);
-    }
-}
diff --git a/src/Models/Price.php b/src/Models/Price.php
new file mode 100644
index 0000000..66babdb
--- /dev/null
+++ b/src/Models/Price.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Support\Carbon;
+use JustBetter\MagentoAsync\Concerns\HasOperations;
+use JustBetter\MagentoPrices\Repository\BaseRepository;
+use JustBetter\MagentoProducts\Models\MagentoProduct;
+use Spatie\Activitylog\LogOptions;
+use Spatie\Activitylog\Traits\LogsActivity;
+
+/**
+ * @property int $id
+ * @property string $sku
+ * @property bool $sync
+ * @property ?array $base_prices
+ * @property ?array $tier_prices
+ * @property ?array $special_prices
+ * @property bool $has_special
+ * @property bool $retrieve
+ * @property bool $update
+ * @property ?string $checksum
+ * @property ?Carbon $last_retrieved
+ * @property ?Carbon $last_updated
+ * @property int $fail_count
+ * @property ?Carbon $last_failed
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * @property ?MagentoProduct $product
+ */
+class Price extends Model
+{
+    use HasOperations;
+    use LogsActivity;
+
+    protected $table = 'magento_prices';
+
+    protected $casts = [
+        'last_retrieved' => 'datetime',
+        'last_updated' => 'datetime',
+        'last_failed' => 'datetime',
+        'base_prices' => 'array',
+        'tier_prices' => 'array',
+        'special_prices' => 'array',
+        'sync' => 'boolean',
+        'has_special' => 'boolean',
+        'retrieve' => 'boolean',
+        'update' => 'boolean',
+    ];
+
+    protected $guarded = [];
+
+    public static function booted(): void
+    {
+        static::updating(function (self $model) {
+            if ($model->update && $model->retrieve) {
+                if (! $model->isDirty(['retrieve'])) {
+                    $model->retrieve = false;
+                } else {
+                    $model->update = false;
+                }
+            }
+        });
+    }
+
+    public function product(): HasOne
+    {
+        return $this->hasOne(MagentoProduct::class, 'sku', 'sku');
+    }
+
+    public function registerFailure(): void
+    {
+        $this->fail_count++;
+        $this->last_failed = now();
+
+        $shouldRetry = $this->fail_count < BaseRepository::resolve()->failLimit();
+        $this->sync = $shouldRetry;
+
+        if (! $shouldRetry) {
+            $this->update = false;
+            $this->retrieve = false;
+            $this->fail_count = 0;
+        }
+
+        $this->save();
+    }
+
+    public function getActivitylogOptions(): LogOptions
+    {
+        return LogOptions::defaults()
+            ->logOnlyDirty()
+            ->dontSubmitEmptyLogs()
+            ->logOnly(['sync', 'base_prices', 'tier_prices', 'special_prices']);
+    }
+}
diff --git a/src/Repository/BaseRepository.php b/src/Repository/BaseRepository.php
new file mode 100644
index 0000000..b4c200b
--- /dev/null
+++ b/src/Repository/BaseRepository.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Repository;
+
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Enumerable;
+use JustBetter\MagentoPrices\Data\PriceData;
+
+abstract class BaseRepository
+{
+    protected int $retrieveLimit = 250;
+
+    protected int $updateLimit = 250;
+
+    protected int $failLimit = 3;
+
+    public function retrieveLimit(): int
+    {
+        return $this->retrieveLimit;
+    }
+
+    public function updateLimit(): int
+    {
+        return $this->updateLimit;
+    }
+
+    public function failLimit(): int
+    {
+        return $this->failLimit;
+    }
+
+    public static function resolve(): BaseRepository
+    {
+        /** @var ?class-string<BaseRepository> $repository */
+        $repository = config('magento-prices.repository');
+
+        throw_if($repository === null, 'Repository has not been found.');
+
+        /** @var BaseRepository $instance */
+        $instance = app($repository);
+
+        return $instance;
+    }
+
+    /** @return Enumerable<int, string> */
+    abstract public function skus(?Carbon $from = null): Enumerable;
+
+    abstract public function retrieve(string $sku): ?PriceData;
+}
diff --git a/src/Repository/Repository.php b/src/Repository/Repository.php
new file mode 100644
index 0000000..d6f42fe
--- /dev/null
+++ b/src/Repository/Repository.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Repository;
+
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Enumerable;
+use JustBetter\MagentoPrices\Data\PriceData;
+use JustBetter\MagentoPrices\Exceptions\NotImplementedException;
+use JustBetter\MagentoProducts\Models\MagentoProduct;
+
+class Repository extends BaseRepository
+{
+    public function retrieve(string $sku): ?PriceData
+    {
+        throw new NotImplementedException;
+    }
+
+    public function skus(?Carbon $from = null): Enumerable
+    {
+        /** @var Enumerable<int, string> $skus */
+        $skus = MagentoProduct::query()
+            ->where('exists_in_magento', '=', true)
+            ->pluck('sku');
+
+        return $skus;
+    }
+}
diff --git a/src/Retriever/DummyPriceRetriever.php b/src/Retriever/DummyPriceRetriever.php
deleted file mode 100644
index 7a17e0b..0000000
--- a/src/Retriever/DummyPriceRetriever.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Retriever;
-
-use Brick\Money\Money;
-use JustBetter\MagentoPrices\Data\BasePriceData;
-use JustBetter\MagentoPrices\Data\PriceData;
-
-class DummyPriceRetriever extends PriceRetriever
-{
-    /** {@inheritDoc} */
-    public function retrieve(string $sku): ?PriceData
-    {
-        $basePrice = new BasePriceData(
-            Money::of(random_int(1, 100), config('magento-prices.currency'))
-        );
-
-        return new PriceData($sku, collect([$basePrice]));
-    }
-}
diff --git a/src/Retriever/DummySkuRetriever.php b/src/Retriever/DummySkuRetriever.php
deleted file mode 100644
index 05ae14c..0000000
--- a/src/Retriever/DummySkuRetriever.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Retriever;
-
-use Carbon\Carbon;
-use Illuminate\Support\Enumerable;
-
-class DummySkuRetriever extends SkuRetriever
-{
-    public function retrieveAll(): Enumerable
-    {
-        return collect([
-            '123',
-            '456',
-        ]);
-    }
-
-    public function retrieveByDate(Carbon $from): Enumerable
-    {
-        return collect([
-            '789',
-        ]);
-    }
-}
diff --git a/src/Retriever/PriceRetriever.php b/src/Retriever/PriceRetriever.php
deleted file mode 100644
index a8f6c0c..0000000
--- a/src/Retriever/PriceRetriever.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Retriever;
-
-use JustBetter\MagentoPrices\Contracts\RetrievesPrice;
-use JustBetter\MagentoPrices\Data\PriceData;
-
-abstract class PriceRetriever implements RetrievesPrice
-{
-    abstract public function retrieve(string $sku): ?PriceData;
-}
diff --git a/src/Retriever/SkuRetriever.php b/src/Retriever/SkuRetriever.php
deleted file mode 100644
index c6fd1a8..0000000
--- a/src/Retriever/SkuRetriever.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Retriever;
-
-use Carbon\Carbon;
-use Illuminate\Support\Enumerable;
-use JustBetter\MagentoPrices\Contracts\RetrievesSkus;
-
-abstract class SkuRetriever implements RetrievesSkus
-{
-    abstract public function retrieveAll(): Enumerable;
-
-    public function retrieveByDate(Carbon $from): Enumerable
-    {
-        return collect();
-    }
-}
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
index eca261f..b031498 100644
--- a/src/ServiceProvider.php
+++ b/src/ServiceProvider.php
@@ -3,47 +3,69 @@
 namespace JustBetter\MagentoPrices;
 
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
-use JustBetter\MagentoPrices\Actions\CheckTierDuplicates;
-use JustBetter\MagentoPrices\Actions\DeterminePricesEqual;
-use JustBetter\MagentoPrices\Actions\FindProductsWithMissingPrices;
-use JustBetter\MagentoPrices\Actions\ImportCustomerGroups;
-use JustBetter\MagentoPrices\Actions\MonitorWaitTimes;
-use JustBetter\MagentoPrices\Actions\ProcessPrice;
-use JustBetter\MagentoPrices\Actions\SyncPrices;
-use JustBetter\MagentoPrices\Actions\UpdateMagentoBasePrice;
-use JustBetter\MagentoPrices\Actions\UpdateMagentoSpecialPrices;
-use JustBetter\MagentoPrices\Actions\UpdateMagentoTierPrices;
-use JustBetter\MagentoPrices\Commands\ImportCustomerGroupsCommand;
-use JustBetter\MagentoPrices\Commands\MonitorWaitTimesCommand;
-use JustBetter\MagentoPrices\Commands\RetrievePricesCommand;
-use JustBetter\MagentoPrices\Commands\SearchMissingPricesCommand;
-use JustBetter\MagentoPrices\Commands\SyncPricesCommand;
-use JustBetter\MagentoPrices\Commands\UpdatePriceCommand;
+use JustBetter\MagentoPrices\Actions\ProcessPrices;
+use JustBetter\MagentoPrices\Actions\Retrieval\RetrieveAllPrices;
+use JustBetter\MagentoPrices\Actions\Retrieval\RetrievePrice;
+use JustBetter\MagentoPrices\Actions\Retrieval\SavePrice;
+use JustBetter\MagentoPrices\Actions\Update\Async\UpdateBasePricesAsync;
+use JustBetter\MagentoPrices\Actions\Update\Async\UpdatePricesAsync;
+use JustBetter\MagentoPrices\Actions\Update\Async\UpdateSpecialPricesAsync;
+use JustBetter\MagentoPrices\Actions\Update\Async\UpdateTierPricesAsync;
+use JustBetter\MagentoPrices\Actions\Update\Sync\UpdateBasePrice;
+use JustBetter\MagentoPrices\Actions\Update\Sync\UpdatePrice;
+use JustBetter\MagentoPrices\Actions\Update\Sync\UpdateSpecialPrice;
+use JustBetter\MagentoPrices\Actions\Update\Sync\UpdateTierPrice;
+use JustBetter\MagentoPrices\Actions\Utility\CheckTierDuplicates;
+use JustBetter\MagentoPrices\Actions\Utility\DeleteCurrentSpecialPrices;
+use JustBetter\MagentoPrices\Actions\Utility\ImportCustomerGroups;
+use JustBetter\MagentoPrices\Actions\Utility\ProcessProductsWithMissingPrices;
+use JustBetter\MagentoPrices\Actions\Utility\RetrieveCustomerGroups;
+use JustBetter\MagentoPrices\Commands\ProcessPricesCommand;
+use JustBetter\MagentoPrices\Commands\Retrieval\RetrieveAllPricesCommand;
+use JustBetter\MagentoPrices\Commands\Retrieval\RetrievePriceCommand;
+use JustBetter\MagentoPrices\Commands\Update\UpdateAllPricesCommand;
+use JustBetter\MagentoPrices\Commands\Update\UpdatePriceCommand;
+use JustBetter\MagentoPrices\Commands\Utility\ImportCustomerGroupsCommand;
+use JustBetter\MagentoPrices\Commands\Utility\ProcessProductsWithMissingPricesCommand;
 
 class ServiceProvider extends BaseServiceProvider
 {
     public function register(): void
+    {
+        $this
+            ->registerConfig()
+            ->registerActions();
+    }
+
+    protected function registerConfig(): static
     {
         $this->mergeConfigFrom(__DIR__.'/../config/magento-prices.php', 'magento-prices');
 
-        $this->registerActions();
+        return $this;
     }
 
     protected function registerActions(): static
     {
-        UpdateMagentoBasePrice::bind();
-        UpdateMagentoSpecialPrices::bind();
-        UpdateMagentoTierPrices::bind();
+        RetrieveAllPrices::bind();
+        RetrievePrice::bind();
+        SavePrice::bind();
 
-        FindProductsWithMissingPrices::bind();
-        CheckTierDuplicates::bind();
+        UpdatePricesAsync::bind();
+        UpdateBasePricesAsync::bind();
+        UpdateTierPricesAsync::bind();
+        UpdateSpecialPricesAsync::bind();
 
-        SyncPrices::bind();
-        ProcessPrice::bind();
+        UpdatePrice::bind();
+        UpdateBasePrice::bind();
+        UpdateTierPrice::bind();
+        UpdateSpecialPrice::bind();
 
-        MonitorWaitTimes::bind();
-        DeterminePricesEqual::bind();
+        ProcessPrices::bind();
 
+        DeleteCurrentSpecialPrices::bind();
+        RetrieveCustomerGroups::bind();
+        CheckTierDuplicates::bind();
+        ProcessProductsWithMissingPrices::bind();
         ImportCustomerGroups::bind();
 
         return $this;
@@ -57,7 +79,7 @@ public function boot(): void
             ->bootCommands();
     }
 
-    protected function bootConfig(): self
+    protected function bootConfig(): static
     {
         if ($this->app->runningInConsole()) {
             $this->publishes([
@@ -68,23 +90,24 @@ protected function bootConfig(): self
         return $this;
     }
 
-    protected function bootCommands(): self
+    protected function bootCommands(): static
     {
         if ($this->app->runningInConsole()) {
             $this->commands([
-                ImportCustomerGroupsCommand::class,
-                RetrievePricesCommand::class,
-                SyncPricesCommand::class,
+                RetrieveAllPricesCommand::class,
+                RetrievePriceCommand::class,
+                UpdateAllPricesCommand::class,
                 UpdatePriceCommand::class,
-                SearchMissingPricesCommand::class,
-                MonitorWaitTimesCommand::class,
+                ProcessPricesCommand::class,
+                ImportCustomerGroupsCommand::class,
+                ProcessProductsWithMissingPricesCommand::class,
             ]);
         }
 
         return $this;
     }
 
-    protected function bootMigrations(): self
+    protected function bootMigrations(): static
     {
         $this->loadMigrationsFrom(__DIR__.'/../database/migrations');
 
diff --git a/tests/Actions/CheckTierDuplicatesTest.php b/tests/Actions/CheckTierDuplicatesTest.php
deleted file mode 100644
index a310907..0000000
--- a/tests/Actions/CheckTierDuplicatesTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Actions;
-
-use Brick\Money\Money;
-use JustBetter\MagentoPrices\Actions\CheckTierDuplicates;
-use JustBetter\MagentoPrices\Data\TierPriceData;
-use JustBetter\MagentoPrices\Exceptions\DuplicateTierPriceException;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class CheckTierDuplicatesTest extends TestCase
-{
-    public function test_it_passes(): void
-    {
-        $action = new CheckTierDuplicates();
-
-        $prices = collect([
-            new TierPriceData('GROUP', Money::of(1, 'EUR'), 1, 0),
-            new TierPriceData('GROUP', Money::of(1, 'EUR'), 2, 0),
-            new TierPriceData('GROUP 2', Money::of(1, 'EUR'), 1, 0),
-            new TierPriceData('GROUP', Money::of(1, 'EUR'), 1, 1),
-        ]);
-
-        try {
-            $action->check('::sku::', $prices);
-        } catch (DuplicateTierPriceException $e) {
-            $this->assertTrue(false, 'exception thrown');
-        }
-
-        $this->assertTrue(true);
-    }
-
-    public function test_it_fails(): void
-    {
-        $action = new CheckTierDuplicates();
-
-        $prices = collect([
-            new TierPriceData('GROUP', Money::of(1, 'EUR'), 1, 0),
-            new TierPriceData('GROUP', Money::of(1, 'EUR'), 1, 0),
-        ]);
-
-        MagentoPrice::query()->create([
-            'sku' => '::sku::',
-        ]);
-
-        $this->expectException(DuplicateTierPriceException::class);
-
-        $action->check('::sku::', $prices);
-    }
-}
diff --git a/tests/Actions/DeterminePricesChangedTest.php b/tests/Actions/DeterminePricesChangedTest.php
deleted file mode 100644
index e747fb4..0000000
--- a/tests/Actions/DeterminePricesChangedTest.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Actions;
-
-use Brick\Money\Money;
-use Carbon\Carbon;
-use JustBetter\MagentoPrices\Data\BasePriceData;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Data\SpecialPriceData;
-use JustBetter\MagentoPrices\Data\TierPriceData;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class DeterminePricesChangedTest extends TestCase
-{
-    /** @dataProvider dataProvider */
-    public function test_it_checks_equals(PriceData $a, PriceData $b, bool $equals): void
-    {
-        Carbon::setTestNow(Carbon::parse('2023-02-20 00:00:00'));
-
-        $this->assertEquals(
-            $equals,
-            $a->equals($b)
-        );
-    }
-
-    public static function dataProvider(): array
-    {
-        return [
-            'Unchanged' => [
-                'a' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect([
-                        new TierPriceData('::group_1::', Money::of(9, 'EUR')),
-                        new TierPriceData('::group_1::', Money::of(8, 'EUR'), 10),
-                        new TierPriceData('::group_2::', Money::of(8, 'EUR'), 1),
-                        new TierPriceData('::group_2::', Money::of(7, 'EUR'), 20, 1),
-                    ]),
-                    collect([
-                        new SpecialPriceData(Money::of(6, 'EUR'), 2, now()->subDay(), now()->addDay()),
-                    ])
-                ),
-                'b' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect([
-                        new TierPriceData('::group_1::', Money::of(9, 'EUR')),
-                        new TierPriceData('::group_1::', Money::of(8, 'EUR'), 10),
-                        new TierPriceData('::group_2::', Money::of(8, 'EUR'), 1),
-                        new TierPriceData('::group_2::', Money::of(7, 'EUR'), 20, 1),
-                    ]),
-                    collect([
-                        new SpecialPriceData(Money::of(6, 'EUR'), 2, now()->subDay(), now()->addDay()),
-                    ])
-                ),
-                'equals' => true,
-            ],
-            'Base added' => [
-                'a' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                        new BasePriceData(Money::of(111, 'EUR'), 1),
-                    ])
-                ),
-                'b' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ])
-                ),
-                'equals' => false,
-            ],
-            'Base added, other store id' => [
-                'a' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                        new BasePriceData(Money::of(111, 'EUR'), 1),
-                    ]),
-                ),
-                'b' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                        new BasePriceData(Money::of(10, 'EUR'), 2),
-                    ]),
-                ),
-                'equals' => false,
-            ],
-            'Base changed' => [
-                'a' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(11, 'EUR')),
-                    ])
-                ),
-                'b' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ])
-                ),
-                'equals' => false,
-            ],
-            'Tier removed' => [
-                'a' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect([
-                        new TierPriceData('::group_1::', Money::of(9, 'EUR')),
-                        new TierPriceData('::group_1::', Money::of(8, 'EUR'), 10),
-                        new TierPriceData('::group_2::', Money::of(8, 'EUR'), 1),
-                        new TierPriceData('::group_2::', Money::of(7, 'EUR'), 20, 1),
-                    ]),
-                ),
-                'b' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect([
-                        new TierPriceData('::group_1::', Money::of(9, 'EUR')),
-                        new TierPriceData('::group_2::', Money::of(7, 'EUR'), 20, 1),
-                    ]),
-                ),
-                'equals' => false,
-            ],
-            'Tier changed' => [
-                'a' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect([
-                        new TierPriceData('::group_1::', Money::of(9, 'EUR')),
-                        new TierPriceData('::group_1::', Money::of(8, 'EUR'), 10),
-                        new TierPriceData('::group_2::', Money::of(8, 'EUR'), 1),
-                        new TierPriceData('::group_2::', Money::of(7, 'EUR'), 20, 1),
-                    ]),
-                ),
-                'b' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect([
-                        new TierPriceData('::group_1::', Money::of(9, 'EUR')),
-                        new TierPriceData('::group_1::', Money::of(8, 'EUR'), 10),
-                        new TierPriceData('::group_2::', Money::of(8, 'EUR'), 1),
-                        new TierPriceData('::group_2::', Money::of(6, 'EUR'), 20, 1),
-                    ]),
-                ),
-                'equals' => false,
-            ],
-            'Tier added, same count' => [
-                'a' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect([
-                        new TierPriceData('::group_1::', Money::of(9, 'EUR')),
-                        new TierPriceData('::group_1::', Money::of(8, 'EUR'), 10),
-                        new TierPriceData('::group_2::', Money::of(8, 'EUR'), 1),
-                        new TierPriceData('::group_2::', Money::of(7, 'EUR'), 20, 1),
-                    ]),
-                ),
-                'b' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect([
-                        new TierPriceData('::group_1::', Money::of(9, 'EUR')),
-                        new TierPriceData('::group_1::', Money::of(8, 'EUR'), 10),
-                        new TierPriceData('::group_2::', Money::of(8, 'EUR'), 1, 2),
-                        new TierPriceData('::group_2::', Money::of(6, 'EUR'), 20, 1),
-                    ]),
-                ),
-                'equals' => false,
-            ],
-            'Special changed' => [
-                'a' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect(),
-                    collect([
-                        new SpecialPriceData(Money::of(5, 'EUR'), 2, now()->subDay(), now()->addDay()),
-                    ])
-                ),
-                'b' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect(),
-                    collect([
-                        new SpecialPriceData(Money::of(6, 'EUR'), 2, now()->subDay(), now()->addDay()),
-                    ])
-                ),
-                'equals' => false,
-            ],
-            'Special date' => [
-                'a' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect(),
-                    collect([
-                        new SpecialPriceData(Money::of(5, 'EUR'), 2, now()->subDay(), now()->addDay()),
-                    ])
-                ),
-                'b' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect(),
-                    collect([
-                        new SpecialPriceData(Money::of(5, 'EUR'), 2, now()->subDay(), now()->addWeek()),
-                    ])
-                ),
-                'equals' => false,
-            ],
-            'Special added' => [
-                'a' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect(),
-                    collect([
-                        new SpecialPriceData(Money::of(5, 'EUR'), 2, now()->subDay(), now()->addDay()),
-                    ])
-                ),
-                'b' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect(),
-                    collect([
-                        new SpecialPriceData(Money::of(6, 'EUR'), 2, now()->subDay(), now()->addDay()),
-                        new SpecialPriceData(Money::of(6, 'EUR'), 1, now()->subDay(), now()->addDay()),
-                    ])
-                ),
-                'equals' => false,
-            ],
-            'Special added, other store' => [
-                'a' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect(),
-                    collect([
-                        new SpecialPriceData(Money::of(6, 'EUR'), 2, now()->subDay(), now()->addDay()),
-                        new SpecialPriceData(Money::of(6, 'EUR'), 1, now()->subDay(), now()->addDay()),
-                    ])
-                ),
-                'b' => new PriceData(
-                    '::sku::',
-                    collect([
-                        new BasePriceData(Money::of(10, 'EUR')),
-                    ]),
-                    collect(),
-                    collect([
-                        new SpecialPriceData(Money::of(6, 'EUR'), 2, now()->subDay(), now()->addDay()),
-                        new SpecialPriceData(Money::of(6, 'EUR'), 3, now()->subDay(), now()->addDay()),
-                    ])
-                ),
-                'equals' => false,
-            ],
-        ];
-    }
-}
diff --git a/tests/Actions/FindProductsWithMissingPricesTest.php b/tests/Actions/FindProductsWithMissingPricesTest.php
deleted file mode 100644
index 8d66491..0000000
--- a/tests/Actions/FindProductsWithMissingPricesTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Actions;
-
-use Illuminate\Support\Facades\Http;
-use JustBetter\MagentoPrices\Actions\FindProductsWithMissingPrices;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class FindProductsWithMissingPricesTest extends TestCase
-{
-    public function test_it_finds_products(): void
-    {
-        Http::fake([
-            '*' => Http::response([
-                'items' => [
-                    [
-                        'sku' => '::sku_1::',
-                        'price' => 10,
-                        'type_id' => 'simple',
-                    ],
-                    [
-                        'sku' => '::sku_2::',
-                        'price' => 0,
-                        'type_id' => 'simple',
-                    ],
-                    [
-                        'sku' => '::sku_3::',
-                        'type_id' => 'simple',
-                    ],
-                ],
-            ]),
-        ]);
-
-        /** @var FindProductsWithMissingPrices $action */
-        $action = app(FindProductsWithMissingPrices::class);
-
-        $prices = $action->retrieve()->all();
-
-        $this->assertEquals(['::sku_2::', '::sku_3::'], $prices);
-    }
-}
diff --git a/tests/Actions/MagentoSpecialPriceUpdateTest.php b/tests/Actions/MagentoSpecialPriceUpdateTest.php
deleted file mode 100644
index d78afc4..0000000
--- a/tests/Actions/MagentoSpecialPriceUpdateTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Actions;
-
-use Brick\Money\Money;
-use Illuminate\Http\Client\Request;
-use Illuminate\Support\Facades\Http;
-use JustBetter\MagentoPrices\Actions\UpdateMagentoSpecialPrices;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Data\SpecialPriceData;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class MagentoSpecialPriceUpdateTest extends TestCase
-{
-    public function test_it_calls_magento_special_price_post(): void
-    {
-        Http::fake([
-            'rest/all/V1/products/special-price-information' => Http::response([
-                '::response::',
-            ]),
-            'rest/all/V1/products/special-price-delete' => Http::response(),
-            'rest/all/V1/products/special-price' => Http::response(),
-        ]);
-
-        /** @var UpdateMagentoSpecialPrices $action */
-        $action = app(UpdateMagentoSpecialPrices::class);
-
-        $from = now()->subDays(30);
-        $to = now();
-
-        $specialPrices = collect([
-            new SpecialPriceData(Money::of(1, 'EUR'), 0, $from, $to),
-        ]);
-
-        $price = new PriceData('::sku::', collect(), collect(), $specialPrices);
-
-        $action->update($price);
-
-        Http::assertSentInOrder([
-            fn (Request $request) => $request->data() == ['skus' => ['::sku::']],
-            fn (Request $request) => $request->data() == ['prices' => ['::response::']],
-            fn (Request $request) => $request->data() == [
-                'prices' => [
-                    [
-                        'sku' => '::sku::',
-                        'price' => 1.0,
-                        'store_id' => 0,
-                        'price_from' => $from->toDateTimeString(),
-                        'price_to' => $to->toDateTimeString(),
-                    ],
-                ],
-            ],
-        ]);
-    }
-
-    public function test_it_calls_magento_special_price_post_async(): void
-    {
-        config()->set('magento-prices.async', true);
-
-        Http::fake([
-            'rest/all/V1/products/special-price-information' => Http::response([
-                '::response::',
-            ]),
-            'rest/all/V1/products/special-price-delete' => Http::response(),
-            'rest/all/async/V1/products/special-price' => Http::response(),
-        ]);
-
-        /** @var UpdateMagentoSpecialPrices $action */
-        $action = app(UpdateMagentoSpecialPrices::class);
-
-        $from = now()->subDays(30);
-        $to = now();
-
-        $specialPrices = collect([
-            new SpecialPriceData(Money::of(1, 'EUR'), 0, $from, $to),
-        ]);
-
-        $price = new PriceData('::sku::', collect(), collect(), $specialPrices);
-
-        $action->update($price);
-
-        Http::assertSentInOrder([
-            fn (Request $request) => $request->data() == ['skus' => ['::sku::']],
-            fn (Request $request) => $request->data() == ['prices' => ['::response::']],
-            fn (Request $request) => $request->data() == [
-                'prices' => [
-                    [
-                        'sku' => '::sku::',
-                        'price' => 1.0,
-                        'store_id' => 0,
-                        'price_from' => $from->toDateTimeString(),
-                        'price_to' => $to->toDateTimeString(),
-                    ],
-                ],
-            ],
-        ]);
-    }
-}
diff --git a/tests/Actions/MagentoUpdateTest.php b/tests/Actions/MagentoUpdateTest.php
deleted file mode 100644
index 0ca3d3c..0000000
--- a/tests/Actions/MagentoUpdateTest.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Actions;
-
-use Brick\Money\Money;
-use Illuminate\Http\Client\Request;
-use Illuminate\Support\Facades\Bus;
-use Illuminate\Support\Facades\Http;
-use JustBetter\MagentoPrices\Actions\UpdateMagentoBasePrice;
-use JustBetter\MagentoPrices\Actions\UpdateMagentoTierPrices;
-use JustBetter\MagentoPrices\Data\BasePriceData;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Data\TierPriceData;
-use JustBetter\MagentoPrices\Exceptions\PriceUpdateException;
-use JustBetter\MagentoPrices\Jobs\ImportCustomerGroupsJob;
-use JustBetter\MagentoPrices\Models\MagentoCustomerGroup;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class MagentoUpdateTest extends TestCase
-{
-    public function test_it_calls_magento_base_price_post(): void
-    {
-        Http::fake([
-            'rest/all/V1/products/base-prices*' => Http::response([]),
-        ]);
-
-        $price = new PriceData('::sku::', collect([new BasePriceData(Money::of(10, 'EUR'))]));
-
-        /** @var UpdateMagentoBasePrice $action */
-        $action = app(UpdateMagentoBasePrice::class);
-        $action->update($price);
-
-        Http::assertSent(function (Request $request): bool {
-            return $request->data() === [
-                'prices' => [
-                    [
-                        'sku' => '::sku::',
-                        'price' => 10.0,
-                        'store_id' => 0,
-                    ],
-                ],
-            ];
-        });
-    }
-
-    public function test_it_calls_magento_base_price_post_async(): void
-    {
-        config()->set('magento-prices.async', true);
-
-        Http::fake([
-            'rest/all/async/V1/products/base-prices*' => Http::response([]),
-        ]);
-
-        $price = new PriceData('::sku::', collect([new BasePriceData(Money::of(10, 'EUR'))]));
-
-        /** @var UpdateMagentoBasePrice $action */
-        $action = app(UpdateMagentoBasePrice::class);
-        $action->update($price);
-
-        Http::assertSent(function (Request $request): bool {
-            return $request->data() === [
-                'prices' => [
-                    [
-                        'sku' => '::sku::',
-                        'price' => 10.0,
-                        'store_id' => 0,
-                    ],
-                ],
-            ];
-        });
-    }
-
-    public function test_it_calls_magento_tier_price_post(): void
-    {
-        Bus::fake([
-            ImportCustomerGroupsJob::class,
-        ]);
-
-        Http::fake([
-            'rest/all/V1/products/tier-prices*' => Http::response([]),
-        ]);
-
-        MagentoCustomerGroup::query()->create([
-            'code' => 'GROUP',
-            'data' => [],
-        ]);
-
-        $price = new PriceData('::sku::', collect(), collect([
-            new TierPriceData('GROUP', Money::of(10, 'EUR')),
-            new TierPriceData('GROUP2', Money::of(10, 'EUR')),
-        ]));
-
-        /** @var UpdateMagentoTierPrices $action */
-        $action = app(UpdateMagentoTierPrices::class);
-        $action->update($price);
-
-        Http::assertSent(function (Request $request): bool {
-            return $request->data() === [
-                'prices' => [
-                    [
-                        'sku' => '::sku::',
-                        'price' => 10.0,
-                        'website_id' => 0,
-                        'quantity' => 1,
-                        'customer_group' => 'GROUP',
-                        'price_type' => 'fixed',
-                    ],
-                ],
-            ];
-        });
-
-        Bus::assertDispatched(ImportCustomerGroupsJob::class);
-    }
-
-    public function test_it_calls_magento_tier_price_post_async(): void
-    {
-        config()->set('magento-prices.async', true);
-
-        Bus::fake([
-            ImportCustomerGroupsJob::class,
-        ]);
-
-        Http::fake([
-            'rest/all/async/V1/products/tier-prices*' => Http::response([]),
-        ]);
-
-        MagentoCustomerGroup::query()->create([
-            'code' => 'GROUP',
-            'data' => [],
-        ]);
-
-        $price = new PriceData('::sku::', collect(), collect([
-            new TierPriceData('GROUP', Money::of(10, 'EUR')),
-            new TierPriceData('GROUP2', Money::of(10, 'EUR')),
-        ]));
-
-        /** @var UpdateMagentoTierPrices $action */
-        $action = app(UpdateMagentoTierPrices::class);
-        $action->update($price);
-
-        Http::assertSent(function (Request $request): bool {
-            return $request->data() === [
-                'prices' => [
-                    [
-                        'sku' => '::sku::',
-                        'price' => 10.0,
-                        'website_id' => 0,
-                        'quantity' => 1,
-                        'customer_group' => 'GROUP',
-                        'price_type' => 'fixed',
-                    ],
-                ],
-            ];
-        });
-
-        Bus::assertDispatched(ImportCustomerGroupsJob::class);
-    }
-
-    public function test_it_can_throw_exceptions_if_groups_are_unavailable(): void
-    {
-        $this->expectException(PriceUpdateException::class);
-
-        Bus::fake([
-            ImportCustomerGroupsJob::class,
-        ]);
-
-        Http::fake([
-            'rest/all/V1/products/tier-prices*' => Http::response([]),
-        ]);
-
-        $price = new PriceData('::sku::', collect(), collect([
-            new TierPriceData('GROUP', Money::of(10, 'EUR')),
-            new TierPriceData('GROUP2', Money::of(10, 'EUR')),
-        ]));
-
-        /** @var UpdateMagentoTierPrices $action */
-        $action = app(UpdateMagentoTierPrices::class);
-        $action->update($price);
-
-        Bus::assertDispatched(ImportCustomerGroupsJob::class);
-    }
-}
diff --git a/tests/Actions/MonitorWaitTimesTest.php b/tests/Actions/MonitorWaitTimesTest.php
deleted file mode 100644
index eee2a13..0000000
--- a/tests/Actions/MonitorWaitTimesTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Actions;
-
-use Illuminate\Support\Facades\Event;
-use JustBetter\MagentoPrices\Actions\MonitorWaitTimes;
-use JustBetter\MagentoPrices\Events\LongWaitDetectedEvent;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class MonitorWaitTimesTest extends TestCase
-{
-    public function test_retrieve_wait_times_dispatches_event(): void
-    {
-        Event::fake();
-
-        config()->set('magento-prices.retrieve_limit', 10);
-        config()->set('magento-prices.monitor.retrieval_max_wait', 5);
-
-        for ($i = 0; $i < 100; $i++) {
-            MagentoPrice::query()->create([
-                'sku' => $i,
-                'sync' => true,
-                'retrieve' => true,
-                'update' => false,
-            ]);
-        }
-
-        /** @var MonitorWaitTimes $action */
-        $action = app(MonitorWaitTimes::class);
-
-        $action->monitor();
-
-        Event::assertDispatched(LongWaitDetectedEvent::class, function (LongWaitDetectedEvent $event) {
-            return $event->type === 'retrieve' && $event->wait === 10;
-        });
-    }
-
-    public function test_retrieve_wait_times_does_not_dispatch_event(): void
-    {
-        Event::fake();
-
-        config()->set('magento-prices.retrieve_limit', 10);
-        config()->set('magento-prices.monitor.retrieval_max_wait', 10);
-
-        for ($i = 0; $i < 100; $i++) {
-            MagentoPrice::query()->create([
-                'sku' => $i,
-                'sync' => true,
-                'retrieve' => true,
-                'update' => false,
-            ]);
-        }
-
-        /** @var MonitorWaitTimes $action */
-        $action = app(MonitorWaitTimes::class);
-
-        $action->monitor();
-
-        Event::assertNotDispatched(LongWaitDetectedEvent::class);
-    }
-
-    public function test_update_wait_times_dispatches_event(): void
-    {
-        Event::fake();
-
-        config()->set('magento-prices.update_limit', 10);
-        config()->set('magento-prices.monitor.update_max_wait', 5);
-
-        for ($i = 0; $i < 100; $i++) {
-            MagentoPrice::query()->create([
-                'sku' => $i,
-                'sync' => true,
-                'retrieve' => false,
-                'update' => true,
-            ]);
-        }
-
-        /** @var MonitorWaitTimes $action */
-        $action = app(MonitorWaitTimes::class);
-
-        $action->monitor();
-
-        Event::assertDispatched(LongWaitDetectedEvent::class, function (LongWaitDetectedEvent $event) {
-            return $event->type === 'update' && $event->wait === 10;
-        });
-    }
-
-    public function test_update_wait_times_does_not_dispatch_event(): void
-    {
-        Event::fake();
-
-        config()->set('magento-prices.update_limit', 10);
-        config()->set('magento-prices.monitor.update_max_wait', 10);
-
-        for ($i = 0; $i < 100; $i++) {
-            MagentoPrice::query()->create([
-                'sku' => $i,
-                'sync' => true,
-                'retrieve' => false,
-                'update' => true,
-            ]);
-        }
-
-        /** @var MonitorWaitTimes $action */
-        $action = app(MonitorWaitTimes::class);
-
-        $action->monitor();
-
-        Event::assertNotDispatched(LongWaitDetectedEvent::class);
-    }
-}
diff --git a/tests/Actions/ProcessPriceTest.php b/tests/Actions/ProcessPriceTest.php
deleted file mode 100644
index cecd59f..0000000
--- a/tests/Actions/ProcessPriceTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Actions;
-
-use Brick\Money\Money;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use JustBetter\MagentoPrices\Actions\ProcessPrice;
-use JustBetter\MagentoPrices\Data\BasePriceData;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Data\TierPriceData;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-use JustBetter\MagentoPrices\Tests\Mocks\CheckMagentoExistenceMock;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class ProcessPriceTest extends TestCase
-{
-    use RefreshDatabase;
-
-    protected PriceData $data;
-
-    protected ProcessPrice $action;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->action = new ProcessPrice(new CheckMagentoExistenceMock());
-
-        $basePrices = collect([
-            new BasePriceData(Money::of(10, 'EUR'), 0),
-        ]);
-
-        $tierPrices = collect([
-            new TierPriceData('::group_1::', Money::of(10, 'EUR'), 0),
-        ]);
-
-        $this->data = new PriceData('::sku::', $basePrices, $tierPrices);
-
-        MagentoPrice::create([
-            'sync' => false,
-            'sku' => '::sku::',
-            'base_prices' => $basePrices,
-            'tier_prices' => $tierPrices,
-        ]);
-    }
-
-    public function test_it_does_not_set_update_if_no_changes(): void
-    {
-        $dto = $this->data->getModel()->getData();
-
-        $this->action->process($dto);
-
-        $this->assertEquals(false, $this->data->getModel()->update);
-    }
-
-    public function test_it_sets_update(): void
-    {
-        $this->data->basePrices = collect([
-            new BasePriceData(Money::of(11, 'EUR'), 0),
-        ]);
-
-        $this->action->process($this->data);
-
-        $this->assertEquals(true, $this->data->getModel()->update);
-        $this->assertEquals(false, $this->data->getModel()->retrieve);
-    }
-}
diff --git a/tests/Actions/ProcessPricesTest.php b/tests/Actions/ProcessPricesTest.php
new file mode 100644
index 0000000..17104bd
--- /dev/null
+++ b/tests/Actions/ProcessPricesTest.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions;
+
+use Illuminate\Support\Facades\Bus;
+use JustBetter\MagentoPrices\Actions\ProcessPrices;
+use JustBetter\MagentoPrices\Jobs\Retrieval\RetrievePriceJob;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePriceJob;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePricesAsyncJob;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class ProcessPricesTest extends TestCase
+{
+    #[Test]
+    public function it_dispatches_retrieval_jobs(): void
+    {
+        Bus::fake();
+
+        Price::query()->create([
+            'sku' => '::sku::',
+            'retrieve' => true,
+        ]);
+
+        /** @var ProcessPrices $action */
+        $action = app(ProcessPrices::class);
+        $action->process();
+
+        Bus::assertDispatched(RetrievePriceJob::class);
+        Bus::assertNotDispatched(UpdatePriceJob::class);
+    }
+
+    #[Test]
+    public function it_dispatches_update_jobs(): void
+    {
+        Bus::fake();
+
+        Price::query()->create([
+            'sku' => '::sku::',
+            'update' => true,
+        ]);
+
+        /** @var ProcessPrices $action */
+        $action = app(ProcessPrices::class);
+        $action->process();
+
+        Bus::assertNotDispatched(RetrievePriceJob::class);
+        Bus::assertDispatched(UpdatePriceJob::class);
+    }
+
+    #[Test]
+    public function it_dispatches_async_update_job(): void
+    {
+        Bus::fake();
+        config()->set('magento-prices.async', true);
+
+        Price::query()->create([
+            'sku' => '::sku::',
+            'update' => true,
+        ]);
+
+        /** @var ProcessPrices $action */
+        $action = app(ProcessPrices::class);
+        $action->process();
+
+        Bus::assertDispatched(UpdatePricesAsyncJob::class);
+    }
+}
diff --git a/tests/Actions/Retrieval/RetrieveAllPricesTest.php b/tests/Actions/Retrieval/RetrieveAllPricesTest.php
new file mode 100644
index 0000000..5de6a81
--- /dev/null
+++ b/tests/Actions/Retrieval/RetrieveAllPricesTest.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Retrieval;
+
+use Illuminate\Support\Facades\Bus;
+use JustBetter\MagentoPrices\Actions\Retrieval\RetrieveAllPrices;
+use JustBetter\MagentoPrices\Jobs\Retrieval\RetrievePriceJob;
+use JustBetter\MagentoPrices\Tests\Fakes\FakeRepository;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use JustBetter\MagentoProducts\Models\MagentoProduct;
+use PHPUnit\Framework\Attributes\Test;
+
+class RetrieveAllPricesTest extends TestCase
+{
+    #[Test]
+    public function it_dispatches_jobs(): void
+    {
+        config()->set('magento-prices.repository', FakeRepository::class);
+        Bus::fake();
+
+        MagentoProduct::query()->create(['sku' => '::sku::', 'exists_in_magento' => true]);
+
+        /** @var RetrieveAllPrices $action */
+        $action = app(RetrieveAllPrices::class);
+        $action->retrieve(null);
+
+        Bus::assertDispatched(RetrievePriceJob::class);
+    }
+}
diff --git a/tests/Actions/Retrieval/RetrievePriceTest.php b/tests/Actions/Retrieval/RetrievePriceTest.php
new file mode 100644
index 0000000..159a503
--- /dev/null
+++ b/tests/Actions/Retrieval/RetrievePriceTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Retrieval;
+
+use Illuminate\Support\Facades\Bus;
+use JustBetter\MagentoPrices\Actions\Retrieval\RetrievePrice;
+use JustBetter\MagentoPrices\Jobs\Retrieval\SavePriceJob;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\Fakes\FakeNullRepository;
+use JustBetter\MagentoPrices\Tests\Fakes\FakeRepository;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class RetrievePriceTest extends TestCase
+{
+    #[Test]
+    public function it_sets_retrieve_when_no_pricedata(): void
+    {
+        config()->set('magento-prices.repository', FakeNullRepository::class);
+
+        /** @var Price $model */
+        $model = Price::query()
+            ->create([
+                'sku' => '::sku::',
+                'retrieve' => true,
+            ]);
+
+        /** @var RetrievePrice $action */
+        $action = app(RetrievePrice::class);
+        $action->retrieve('::sku::', false);
+
+        $this->assertFalse($model->refresh()->retrieve);
+    }
+
+    #[Test]
+    public function it_dispatches_save_job(): void
+    {
+        config()->set('magento-prices.repository', FakeRepository::class);
+        Bus::fake();
+
+        Price::query()
+            ->create([
+                'sku' => '::sku::',
+            ]);
+
+        /** @var RetrievePrice $action */
+        $action = app(RetrievePrice::class);
+        $action->retrieve('::sku::', true);
+
+        Bus::assertDispatched(SavePriceJob::class, function (SavePriceJob $job): bool {
+            return $job->data['sku'] === '::sku::' && $job->forceUpdate;
+        });
+    }
+}
diff --git a/tests/Actions/Retrieval/SavePriceTest.php b/tests/Actions/Retrieval/SavePriceTest.php
new file mode 100644
index 0000000..e971364
--- /dev/null
+++ b/tests/Actions/Retrieval/SavePriceTest.php
@@ -0,0 +1,175 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Retrieval;
+
+use Illuminate\Support\Carbon;
+use JustBetter\MagentoPrices\Actions\Retrieval\SavePrice;
+use JustBetter\MagentoPrices\Data\PriceData;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class SavePriceTest extends TestCase
+{
+    #[Test]
+    public function it_saves_fields(): void
+    {
+        Carbon::setTestNow('2024-08-05');
+
+        $priceData = PriceData::of([
+            'sku' => '::sku::',
+            'base_prices' => [
+                [
+                    'store_id' => 0,
+                    'price' => 10,
+                ],
+            ],
+            'tier_prices' => [
+                [
+                    'website_id' => 0,
+                    'customer_group' => 'group_1',
+                    'price_type' => 'fixed',
+                    'quantity' => 1,
+                    'price' => 8,
+                ],
+            ],
+            'special_prices' => [
+                [
+                    'store_id' => 0,
+                    'price' => 5,
+                    'price_from' => now()->subWeek()->toDateString(),
+                    'price_to' => now()->addWeek()->toDateString(),
+                ],
+            ],
+        ]);
+
+        /** @var SavePrice $action */
+        $action = app(SavePrice::class);
+        $action->save($priceData, false);
+
+        /** @var Price $model */
+        $model = Price::query()->firstWhere('sku', '=', '::sku::');
+
+        $this->assertNotNull($model->base_prices);
+        $this->assertNotNull($model->tier_prices);
+        $this->assertNotNull($model->special_prices);
+        $this->assertEquals([['store_id' => 0, 'price' => 10]], $model->base_prices);
+        $this->assertEquals([
+            [
+                'website_id' => 0,
+                'customer_group' => 'group_1',
+                'price_type' => 'fixed',
+                'quantity' => 1,
+                'price' => 8,
+            ],
+        ], $model->tier_prices);
+
+        $this->assertEquals([
+            [
+                'store_id' => 0,
+                'price' => 5,
+                'price_from' => now()->subWeek()->toDateString(),
+                'price_to' => now()->addWeek()->toDateString(),
+            ],
+        ], $model->special_prices);
+
+        $this->assertTrue($model->sync);
+        $this->assertFalse($model->retrieve);
+        $this->assertTrue($model->update);
+        $this->assertNotNull($model->last_retrieved);
+        $this->assertEquals('27f10836349f35baf9aa229f963e4ddf', $model->checksum);
+
+    }
+
+    #[Test]
+    public function it_does_not_set_update_when_unchanged(): void
+    {
+        $priceData = PriceData::of([
+            'sku' => '::sku::',
+            'base_prices' => [
+                [
+                    'store_id' => 0,
+                    'price' => 10,
+                ],
+            ],
+            'tier_prices' => [
+                [
+                    'website_id' => 0,
+                    'customer_group' => 'group_1',
+                    'price_type' => 'fixed',
+                    'quantity' => 1,
+                    'price' => 8,
+                ],
+            ],
+            'special_prices' => [
+                [
+                    'store_id' => 0,
+                    'price' => 5,
+                    'price_from' => now()->subWeek()->toDateString(),
+                    'price_to' => now()->addWeek()->toDateString(),
+                ],
+            ],
+        ]);
+
+        /** @var SavePrice $action */
+        $action = app(SavePrice::class);
+        $action->save($priceData, false);
+
+        /** @var Price $model */
+        $model = Price::query()->firstWhere('sku', '=', '::sku::');
+
+        $this->assertTrue($model->update);
+
+        $model->update(['update' => false]);
+
+        $action->save($priceData, false);
+
+        $this->assertFalse($model->refresh()->update);
+    }
+
+    #[Test]
+    public function it_can_force_update(): void
+    {
+        $priceData = PriceData::of([
+            'sku' => '::sku::',
+            'base_prices' => [
+                [
+                    'store_id' => 0,
+                    'price' => 10,
+                ],
+            ],
+            'tier_prices' => [
+                [
+                    'website_id' => 0,
+                    'customer_group' => 'group_1',
+                    'price_type' => 'fixed',
+                    'quantity' => 1,
+                    'price' => 8,
+                ],
+            ],
+            'special_prices' => [
+                [
+                    'store_id' => 0,
+                    'price' => 5,
+                    'price_from' => now()->subWeek()->toDateString(),
+                    'price_to' => now()->addWeek()->toDateString(),
+                ],
+            ],
+        ]);
+
+        /** @var SavePrice $action */
+        $action = app(SavePrice::class);
+        $action->save($priceData, false);
+
+        /** @var Price $model */
+        $model = Price::query()->firstWhere('sku', '=', '::sku::');
+
+        $this->assertTrue($model->update);
+
+        $model->update(['update' => false]);
+
+        $action->save($priceData, true);
+
+        $this->assertTrue($model->refresh()->update);
+    }
+}
diff --git a/tests/Actions/SyncPricesTest.php b/tests/Actions/SyncPricesTest.php
deleted file mode 100644
index 9aa42dc..0000000
--- a/tests/Actions/SyncPricesTest.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Actions;
-
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Support\Facades\Bus;
-use JustBetter\MagentoPrices\Actions\SyncPrices;
-use JustBetter\MagentoPrices\Jobs\RetrievePriceJob;
-use JustBetter\MagentoPrices\Jobs\UpdatePriceJob;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class SyncPricesTest extends TestCase
-{
-    use RefreshDatabase;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        Bus::fake([RetrievePriceJob::class, UpdatePriceJob::class]);
-    }
-
-    public function test_it_resets_double_state(): void
-    {
-        MagentoPrice::create([
-            'sku' => '::sku_1::',
-            'retrieve' => true,
-            'update' => true,
-        ]);
-
-        MagentoPrice::create([
-            'sku' => '::sku_2::',
-            'retrieve' => true,
-            'update' => true,
-        ]);
-
-        $action = new SyncPrices();
-        $action->sync();
-
-        $this->assertEquals(2, MagentoPrice::shouldRetrieve()->count());
-        $this->assertEquals(0, MagentoPrice::shouldUpdate()->count());
-    }
-
-    public function test_it_dispatches_single_retrieve_job(): void
-    {
-        MagentoPrice::create([
-            'sku' => '::sku_1::',
-            'retrieve' => true,
-            'update' => false,
-        ]);
-
-        $action = new SyncPrices();
-        $action->sync();
-
-        Bus::assertDispatched(RetrievePriceJob::class);
-    }
-
-    public function test_it_dispatches_single_update_job(): void
-    {
-        MagentoPrice::create([
-            'sku' => '::sku_1::',
-            'retrieve' => false,
-            'update' => true,
-        ]);
-
-        $action = new SyncPrices();
-        $action->sync();
-
-        Bus::assertDispatched(UpdatePriceJob::class);
-    }
-}
diff --git a/tests/Actions/Update/Async/UpdateBasePricesAsyncTest.php b/tests/Actions/Update/Async/UpdateBasePricesAsyncTest.php
new file mode 100644
index 0000000..8df373d
--- /dev/null
+++ b/tests/Actions/Update/Async/UpdateBasePricesAsyncTest.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Update\Async;
+
+use Illuminate\Http\Client\Request;
+use Illuminate\Support\Facades\Http;
+use JustBetter\MagentoClient\Client\Magento;
+use JustBetter\MagentoPrices\Actions\Update\Async\UpdateBasePricesAsync;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class UpdateBasePricesAsyncTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Magento::fake();
+    }
+
+    #[Test]
+    public function it_updates_base_prices_async(): void
+    {
+        Http::fake([
+            'magento/rest/all/async/bulk/V1/products/base-prices' => Http::response([
+                'bulk_uuid' => '::uuid::',
+                'request_items' => [
+                    [
+                        'id' => 0,
+                        'status' => 'accepted',
+                    ],
+                    [
+                        'id' => 1,
+                        'status' => 'accepted',
+                    ],
+                ],
+            ]),
+        ])->preventStrayRequests();
+
+        $models = collect([
+            Price::query()->create([
+                'sku' => '::sku_1::',
+                'base_prices' => [
+                    [
+                        'store_id' => 1,
+                        'price' => 10,
+                    ],
+                ],
+            ]),
+            Price::query()->create([
+                'sku' => '::sku_2::',
+                'base_prices' => [
+                    [
+                        'store_id' => 1,
+                        'price' => 10,
+                    ],
+                    [
+                        'store_id' => 2,
+                        'price' => 20,
+                    ],
+                ],
+            ]),
+            Price::query()->create([
+                'sku' => '::sku_3::',
+                'base_prices' => [],
+            ]),
+            Price::query()->create([
+                'sku' => '::sku_4::',
+                'base_prices' => [],
+            ]),
+        ]);
+
+        /** @var UpdateBasePricesAsync $action */
+        $action = app(UpdateBasePricesAsync::class);
+        $action->update($models);
+
+        Http::assertSent(function (Request $request): bool {
+            return $request->data() === [
+                [
+                    'prices' => [
+                        [
+                            'store_id' => 1,
+                            'price' => 10,
+                            'sku' => '::sku_1::',
+                        ],
+                    ],
+                ],
+                [
+                    'prices' => [
+                        [
+                            'store_id' => 1,
+                            'price' => 10,
+                            'sku' => '::sku_2::',
+                        ],
+                        [
+                            'store_id' => 2,
+                            'price' => 20,
+                            'sku' => '::sku_2::',
+                        ],
+                    ],
+                ],
+            ];
+        });
+    }
+
+    #[Test]
+    public function it_does_nothing_when_all_prices_are_rejected(): void
+    {
+        $models = collect([
+            Price::query()->create([
+                'sku' => '::sku_3::',
+                'base_prices' => [],
+            ]),
+            Price::query()->create([
+                'sku' => '::sku_4::',
+            ]),
+        ]);
+
+        /** @var UpdateBasePricesAsync $action */
+        $action = app(UpdateBasePricesAsync::class);
+        $action->update($models);
+
+        Http::assertNothingSent();
+    }
+}
diff --git a/tests/Actions/Update/Async/UpdatePricesAsyncTest.php b/tests/Actions/Update/Async/UpdatePricesAsyncTest.php
new file mode 100644
index 0000000..9c865cb
--- /dev/null
+++ b/tests/Actions/Update/Async/UpdatePricesAsyncTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Update\Async;
+
+use JustBetter\MagentoPrices\Actions\Update\Async\UpdatePricesAsync;
+use JustBetter\MagentoPrices\Contracts\Update\Async\UpdatesBasePricesAsync;
+use JustBetter\MagentoPrices\Contracts\Update\Async\UpdatesSpecialPricesAsync;
+use JustBetter\MagentoPrices\Contracts\Update\Async\UpdatesTierPricesAsync;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use Mockery\MockInterface;
+use PHPUnit\Framework\Attributes\Test;
+
+class UpdatePricesAsyncTest extends TestCase
+{
+    #[Test]
+    public function it_calls_update_actions(): void
+    {
+        $this->mock(UpdatesBasePricesAsync::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('update')->once()->andReturnTrue();
+        });
+
+        $this->mock(UpdatesTierPricesAsync::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('update')->once()->andReturnTrue();
+        });
+
+        $this->mock(UpdatesSpecialPricesAsync::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('update')->once()->andReturnTrue();
+        });
+        /** @var UpdatePricesAsync $action */
+        $action = app(UpdatePricesAsync::class);
+        $action->update(collect());
+    }
+}
diff --git a/tests/Actions/Update/Async/UpdateSpecialPricesAsyncTest.php b/tests/Actions/Update/Async/UpdateSpecialPricesAsyncTest.php
new file mode 100644
index 0000000..232ae3f
--- /dev/null
+++ b/tests/Actions/Update/Async/UpdateSpecialPricesAsyncTest.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Update\Async;
+
+use Illuminate\Http\Client\Request;
+use Illuminate\Support\Facades\Http;
+use JustBetter\MagentoClient\Client\Magento;
+use JustBetter\MagentoPrices\Actions\Update\Async\UpdateSpecialPricesAsync;
+use JustBetter\MagentoPrices\Contracts\Utility\DeletesCurrentSpecialPrices;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use Mockery\MockInterface;
+use PHPUnit\Framework\Attributes\Test;
+
+class UpdateSpecialPricesAsyncTest extends TestCase
+{
+    #[Test]
+    public function it_updates_special_prices_async(): void
+    {
+        $this->mock(DeletesCurrentSpecialPrices::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('delete')->twice()->andReturn();
+        });
+
+        Magento::fake();
+
+        Http::fake([
+            'magento/rest/all/async/bulk/V1/products/special-price' => Http::response([
+                'bulk_uuid' => '::uuid::',
+                'request_items' => [
+                    [
+                        'id' => 0,
+                        'status' => 'accepted',
+                    ],
+                    [
+                        'id' => 1,
+                        'status' => 'accepted',
+                    ],
+                ],
+            ]),
+        ])->preventStrayRequests();
+
+        $models = collect([
+            Price::query()->create([
+                'sku' => '::sku_1::',
+                'has_special' => true,
+                'special_prices' => [
+                    [
+                        'store_id' => 1,
+                        'price' => 10,
+                        'from' => '2024-07-30',
+                        'to' => '2024-08-30',
+                    ],
+                ],
+            ]),
+            Price::query()->create([
+                'sku' => '::sku_2::',
+                'has_special' => false,
+                'special_prices' => [
+                    [
+                        'store_id' => 1,
+                        'price' => 10,
+                        'from' => '2024-07-30',
+                        'to' => '2024-08-30',
+                    ],
+                ],
+            ]),
+            Price::query()->create([
+                'sku' => '::sku_3::',
+                'has_special' => true,
+                'special_prices' => [],
+            ]),
+            Price::query()->create([
+                'sku' => '::sku_4::',
+                'special_prices' => [],
+            ]),
+        ]);
+
+        /** @var UpdateSpecialPricesAsync $action */
+        $action = app(UpdateSpecialPricesAsync::class);
+        $action->update($models);
+
+        Http::assertSent(function (Request $request): bool {
+            return $request->data() === [
+                [
+                    'prices' => [
+                        [
+                            'store_id' => 1,
+                            'price' => 10,
+                            'from' => '2024-07-30',
+                            'to' => '2024-08-30',
+                            'sku' => '::sku_1::',
+                        ],
+                    ],
+                ],
+                [
+                    'prices' => [
+                        [
+                            'store_id' => 1,
+                            'price' => 10,
+                            'from' => '2024-07-30',
+                            'to' => '2024-08-30',
+                            'sku' => '::sku_2::',
+                        ],
+                    ],
+                ],
+            ];
+        });
+    }
+
+    #[Test]
+    public function it_does_nothing_when_all_prices_are_rejected(): void
+    {
+        $models = collect([
+            Price::query()->create([
+                'sku' => '::sku_3::',
+                'special_prices' => [],
+            ]),
+            Price::query()->create([
+                'sku' => '::sku_4::',
+            ]),
+        ]);
+
+        /** @var UpdateSpecialPricesAsync $action */
+        $action = app(UpdateSpecialPricesAsync::class);
+        $action->update($models);
+
+        Http::assertNothingSent();
+    }
+}
diff --git a/tests/Actions/Update/Async/UpdateTierPricesAsyncTest.php b/tests/Actions/Update/Async/UpdateTierPricesAsyncTest.php
new file mode 100644
index 0000000..a18c13e
--- /dev/null
+++ b/tests/Actions/Update/Async/UpdateTierPricesAsyncTest.php
@@ -0,0 +1,157 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Update\Async;
+
+use Illuminate\Http\Client\Request;
+use Illuminate\Support\Facades\Http;
+use JustBetter\MagentoClient\Client\Magento;
+use JustBetter\MagentoPrices\Actions\Update\Async\UpdateTierPricesAsync;
+use JustBetter\MagentoPrices\Contracts\Utility\RetrievesCustomerGroups;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use Mockery\MockInterface;
+use PHPUnit\Framework\Attributes\Test;
+
+class UpdateTierPricesAsyncTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Magento::fake();
+
+        $this->mock(RetrievesCustomerGroups::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('retrieve')->andReturn(['GENERAL', 'RETAIL']);
+        });
+    }
+
+    #[Test]
+    public function it_updates_tier_prices_async(): void
+    {
+        Http::fake([
+            'magento/rest/all/async/bulk/V1/products/tier-prices' => Http::response([
+                'bulk_uuid' => '::uuid::',
+                'request_items' => [
+                    [
+                        'id' => 0,
+                        'status' => 'accepted',
+                    ],
+                    [
+                        'id' => 1,
+                        'status' => 'accepted',
+                    ],
+                ],
+            ]),
+        ])->preventStrayRequests();
+
+        $models = collect([
+            Price::query()->create([
+                'sku' => '::sku_1::',
+                'tier_prices' => [
+                    [
+                        'website_id' => 1,
+                        'quantity' => 1,
+                        'customer_group' => 'GENERAL',
+                        'price' => 10,
+                    ],
+                    [
+                        'website_id' => 1,
+                        'quantity' => 1,
+                        'customer_group' => 'RETAIL',
+                        'price' => 8,
+                    ],
+                ],
+            ]),
+            Price::query()->create([
+                'sku' => '::sku_2::',
+                'tier_prices' => [
+                    [
+                        'website_id' => 1,
+                        'quantity' => 1,
+                        'customer_group' => 'GENERAL',
+                        'price' => 10,
+                    ],
+                    [
+                        'website_id' => 1,
+                        'quantity' => 1,
+                        'customer_group' => 'RETAIL',
+                        'price' => 8,
+                    ],
+                ],
+            ]),
+            Price::query()->create([
+                'sku' => '::sku_3::',
+                'tier_prices' => [],
+            ]),
+            Price::query()->create([
+                'sku' => '::sku_4::',
+                'tier_prices' => [],
+            ]),
+        ]);
+
+        /** @var UpdateTierPricesAsync $action */
+        $action = app(UpdateTierPricesAsync::class);
+        $action->update($models);
+
+        Http::assertSent(function (Request $request): bool {
+            return $request->data() === [
+                [
+                    'prices' => [
+                        [
+                            'website_id' => 1,
+                            'quantity' => 1,
+                            'customer_group' => 'GENERAL',
+                            'price' => 10,
+                            'sku' => '::sku_1::',
+                        ],
+                        [
+                            'website_id' => 1,
+                            'quantity' => 1,
+                            'customer_group' => 'RETAIL',
+                            'price' => 8,
+                            'sku' => '::sku_1::',
+                        ],
+                    ],
+                ],
+                [
+                    'prices' => [
+                        [
+                            'website_id' => 1,
+                            'quantity' => 1,
+                            'customer_group' => 'GENERAL',
+                            'price' => 10,
+                            'sku' => '::sku_2::',
+                        ],
+                        [
+                            'website_id' => 1,
+                            'quantity' => 1,
+                            'customer_group' => 'RETAIL',
+                            'price' => 8,
+                            'sku' => '::sku_2::',
+                        ],
+                    ],
+                ],
+            ];
+        });
+    }
+
+    #[Test]
+    public function it_does_nothing_when_all_prices_are_rejected(): void
+    {
+        $models = collect([
+            Price::query()->create([
+                'sku' => '::sku_3::',
+                'tier_prices' => [],
+            ]),
+            Price::query()->create([
+                'sku' => '::sku_4::',
+            ]),
+        ]);
+
+        /** @var UpdateTierPricesAsync $action */
+        $action = app(UpdateTierPricesAsync::class);
+        $action->update($models);
+
+        Http::assertNothingSent();
+    }
+}
diff --git a/tests/Actions/Update/Sync/UpdateBasePriceTest.php b/tests/Actions/Update/Sync/UpdateBasePriceTest.php
new file mode 100644
index 0000000..50aaf84
--- /dev/null
+++ b/tests/Actions/Update/Sync/UpdateBasePriceTest.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Update\Sync;
+
+use Illuminate\Support\Facades\Http;
+use JustBetter\MagentoClient\Client\Magento;
+use JustBetter\MagentoPrices\Actions\Update\Sync\UpdateBasePrice;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class UpdateBasePriceTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Magento::fake();
+    }
+
+    #[Test]
+    public function it_updates_base_price(): void
+    {
+        Http::fake([
+            'magento/rest/all/V1/products/base-prices' => Http::response(),
+        ])->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'base_prices' => [
+                [
+                    'store_id' => 1,
+                    'price' => 10,
+                ],
+            ],
+        ]);
+
+        /** @var UpdateBasePrice $action */
+        $action = app(UpdateBasePrice::class);
+        $this->assertTrue($action->update($model));
+    }
+
+    #[Test]
+    public function it_returns_false_on_failure(): void
+    {
+        Http::fake([
+            'magento/rest/all/V1/products/base-prices' => Http::response(null, 500),
+        ])->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'base_prices' => [
+                [
+                    'store_id' => 1,
+                    'price' => 10,
+                ],
+            ],
+        ]);
+
+        /** @var UpdateBasePrice $action */
+        $action = app(UpdateBasePrice::class);
+        $this->assertFalse($action->update($model));
+    }
+
+    #[Test]
+    public function it_removes_base_prices(): void
+    {
+        Http::fake([
+            'magento/rest/all/V1/products/base-prices' => Http::response(),
+        ])->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'base_prices' => [
+                [
+                    'store_id' => 1,
+                    'price' => 10,
+                ],
+            ],
+        ]);
+
+        /** @var UpdateBasePrice $action */
+        $action = app(UpdateBasePrice::class);
+        $this->assertTrue($action->update($model));
+    }
+
+    #[Test]
+    public function it_only_removes_base_prices_once(): void
+    {
+        Http::fake()->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'base_prices' => [],
+        ]);
+
+        /** @var UpdateBasePrice $action */
+        $action = app(UpdateBasePrice::class);
+        $this->assertTrue($action->update($model));
+
+        Http::assertNothingSent();
+    }
+}
diff --git a/tests/Actions/Update/Sync/UpdatePriceTest.php b/tests/Actions/Update/Sync/UpdatePriceTest.php
new file mode 100644
index 0000000..fe21754
--- /dev/null
+++ b/tests/Actions/Update/Sync/UpdatePriceTest.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Update\Sync;
+
+use Illuminate\Support\Facades\Event;
+use JustBetter\MagentoPrices\Actions\Update\Sync\UpdatePrice;
+use JustBetter\MagentoPrices\Contracts\Update\Sync\UpdatesBasePrice;
+use JustBetter\MagentoPrices\Contracts\Update\Sync\UpdatesSpecialPrice;
+use JustBetter\MagentoPrices\Contracts\Update\Sync\UpdatesTierPrice;
+use JustBetter\MagentoPrices\Events\UpdatedPriceEvent;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use JustBetter\MagentoProducts\Contracts\ChecksMagentoExistence;
+use Mockery\MockInterface;
+use PHPUnit\Framework\Attributes\Test;
+
+class UpdatePriceTest extends TestCase
+{
+    #[Test]
+    public function it_does_nothing_when_not_in_magento(): void
+    {
+        $this->mock(ChecksMagentoExistence::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('exists')->with('::sku::')->andReturnFalse();
+        });
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'update' => true,
+        ]);
+
+        /** @var UpdatePrice $action */
+        $action = app(UpdatePrice::class);
+        $action->update($model);
+
+        $this->assertFalse($model->refresh()->update);
+    }
+
+    #[Test]
+    public function it_calls_update_actions(): void
+    {
+        Event::fake([UpdatedPriceEvent::class]);
+
+        $this->mock(ChecksMagentoExistence::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('exists')->with('::sku::')->andReturnTrue();
+        });
+
+        $this->mock(UpdatesBasePrice::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('update')->andReturnTrue();
+        });
+
+        $this->mock(UpdatesTierPrice::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('update')->andReturnTrue();
+        });
+
+        $this->mock(UpdatesSpecialPrice::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('update')->andReturnTrue();
+        });
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'update' => true,
+        ]);
+
+        /** @var UpdatePrice $action */
+        $action = app(UpdatePrice::class);
+        $action->update($model);
+
+        $model->refresh();
+
+        $this->assertFalse($model->update);
+        $this->assertNotNull($model->last_updated);
+
+        Event::assertDispatched(UpdatedPriceEvent::class);
+    }
+
+    #[Test]
+    public function it_registers_failure_when_once_call_fails(): void
+    {
+        Event::fake([UpdatedPriceEvent::class]);
+
+        $this->mock(ChecksMagentoExistence::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('exists')->with('::sku::')->andReturnTrue();
+        });
+
+        $this->mock(UpdatesBasePrice::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('update')->andReturnTrue();
+        });
+
+        $this->mock(UpdatesTierPrice::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('update')->andReturnTrue();
+        });
+
+        $this->mock(UpdatesSpecialPrice::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('update')->andReturnFalse();
+        });
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'update' => true,
+            'fail_count' => 0,
+            'last_failed' => null,
+        ]);
+
+        /** @var UpdatePrice $action */
+        $action = app(UpdatePrice::class);
+        $action->update($model);
+
+        $model->refresh();
+
+        $this->assertTrue($model->update);
+        $this->assertNotNull($model->last_failed);
+        $this->assertEquals(1, $model->fail_count);
+
+        Event::assertNotDispatched(UpdatedPriceEvent::class);
+    }
+}
diff --git a/tests/Actions/Update/Sync/UpdateSpecialPriceTest.php b/tests/Actions/Update/Sync/UpdateSpecialPriceTest.php
new file mode 100644
index 0000000..f9c670a
--- /dev/null
+++ b/tests/Actions/Update/Sync/UpdateSpecialPriceTest.php
@@ -0,0 +1,119 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Update\Sync;
+
+use Illuminate\Support\Facades\Http;
+use JustBetter\MagentoClient\Client\Magento;
+use JustBetter\MagentoPrices\Actions\Update\Sync\UpdateSpecialPrice;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class UpdateSpecialPriceTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Magento::fake();
+    }
+
+    #[Test]
+    public function it_updates_special_price(): void
+    {
+        Http::fake([
+            'magento/rest/all/V1/products/special-price' => Http::response(),
+            'magento/rest/all/V1/products/special-price-information' => Http::response(),
+        ])->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'has_special' => false,
+            'special_prices' => [
+                [
+                    'store_id' => 1,
+                    'price' => 10,
+                    'from' => '2024-07-30',
+                    'to' => '2024-08-30',
+                ],
+            ],
+        ]);
+
+        /** @var UpdateSpecialPrice $action */
+        $action = app(UpdateSpecialPrice::class);
+        $this->assertTrue($action->update($model));
+        $this->assertTrue($model->refresh()->has_special);
+    }
+
+    #[Test]
+    public function it_returns_false_on_failure(): void
+    {
+        Http::fake([
+            'magento/rest/all/V1/products/special-price' => Http::response(null, 500),
+            'magento/rest/all/V1/products/special-price-information' => Http::response(),
+        ])->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'has_special' => true,
+            'special_prices' => [
+                [
+                    'store_id' => 1,
+                    'price' => 10,
+                    'from' => '2024-07-30',
+                    'to' => '2024-08-30',
+                ],
+            ],
+        ]);
+
+        /** @var UpdateSpecialPrice $action */
+        $action = app(UpdateSpecialPrice::class);
+        $this->assertFalse($action->update($model));
+    }
+
+    #[Test]
+    public function it_removes_special_prices(): void
+    {
+        Http::fake([
+            'magento/rest/all/V1/products/special-price-information' => Http::response([
+                [
+                    'price',
+                ],
+            ]),
+            'magento/rest/all/V1/products/special-price-delete' => Http::response(),
+        ])->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'has_special' => true,
+            'special_prices' => [],
+        ]);
+
+        /** @var UpdateSpecialPrice $action */
+        $action = app(UpdateSpecialPrice::class);
+        $action->update($model);
+        $this->assertFalse($model->refresh()->has_special);
+    }
+
+    #[Test]
+    public function it_only_removes_special_prices_once(): void
+    {
+        Http::fake()->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'has_special' => false,
+            'special_prices' => [],
+        ]);
+
+        /** @var UpdateSpecialPrice $action */
+        $action = app(UpdateSpecialPrice::class);
+        $this->assertTrue($action->update($model));
+
+        Http::assertNothingSent();
+    }
+}
diff --git a/tests/Actions/Update/Sync/UpdateTierPriceTest.php b/tests/Actions/Update/Sync/UpdateTierPriceTest.php
new file mode 100644
index 0000000..10b3e9a
--- /dev/null
+++ b/tests/Actions/Update/Sync/UpdateTierPriceTest.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Update\Sync;
+
+use Illuminate\Support\Facades\Http;
+use JustBetter\MagentoClient\Client\Magento;
+use JustBetter\MagentoPrices\Actions\Update\Sync\UpdateTierPrice;
+use JustBetter\MagentoPrices\Contracts\Utility\RetrievesCustomerGroups;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use Mockery\MockInterface;
+use PHPUnit\Framework\Attributes\Test;
+
+class UpdateTierPriceTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Magento::fake();
+
+        $this->mock(RetrievesCustomerGroups::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('retrieve')->andReturn(['GENERAL', 'RETAIL']);
+        });
+    }
+
+    #[Test]
+    public function it_updates_tier_price(): void
+    {
+        Http::fake([
+            'magento/rest/all/V1/products/tier-prices' => Http::response(),
+        ])->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'tier_prices' => [
+                [
+                    'website_id' => 1,
+                    'quantity' => 1,
+                    'customer_group' => 'GENERAL',
+                    'price' => 10,
+                ],
+                [
+                    'website_id' => 1,
+                    'quantity' => 1,
+                    'customer_group' => 'RETAIL',
+                    'price' => 8,
+                ],
+            ],
+        ]);
+
+        /** @var UpdateTierPrice $action */
+        $action = app(UpdateTierPrice::class);
+        $this->assertTrue($action->update($model));
+    }
+
+    #[Test]
+    public function it_returns_false_on_failure(): void
+    {
+        Http::fake([
+            'magento/rest/all/V1/products/tier-prices' => Http::response(null, 500),
+        ])->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'tier_prices' => [
+                [
+                    'website_id' => 1,
+                    'quantity' => 1,
+                    'customer_group' => 'GENERAL',
+                    'price' => 10,
+                ],
+                [
+                    'website_id' => 1,
+                    'quantity' => 1,
+                    'customer_group' => 'RETAIL',
+                    'price' => 8,
+                ],
+            ],
+        ]);
+
+        /** @var UpdateTierPrice $action */
+        $action = app(UpdateTierPrice::class);
+        $this->assertFalse($action->update($model));
+    }
+
+    #[Test]
+    public function it_removes_tier_prices(): void
+    {
+        Http::fake([
+            'magento/rest/all/V1/products/tier-prices' => Http::response(),
+        ])->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'tier_prices' => [],
+        ]);
+
+        /** @var UpdateTierPrice $action */
+        $action = app(UpdateTierPrice::class);
+        $this->assertTrue($action->update($model));
+    }
+
+    #[Test]
+    public function it_only_removes_tier_prices_once(): void
+    {
+        Http::fake()->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'tier_prices' => [],
+        ]);
+
+        /** @var UpdateTierPrice $action */
+        $action = app(UpdateTierPrice::class);
+        $this->assertTrue($action->update($model));
+
+        Http::assertNothingSent();
+    }
+}
diff --git a/tests/Actions/Utility/CheckTierDuplicatesTest.php b/tests/Actions/Utility/CheckTierDuplicatesTest.php
new file mode 100644
index 0000000..71ef558
--- /dev/null
+++ b/tests/Actions/Utility/CheckTierDuplicatesTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Utility;
+
+use JustBetter\MagentoPrices\Actions\Utility\CheckTierDuplicates;
+use JustBetter\MagentoPrices\Exceptions\DuplicateTierPriceException;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class CheckTierDuplicatesTest extends TestCase
+{
+    #[Test]
+    public function it_passes(): void
+    {
+        /** @var Price $model */
+        $model = Price::query()->create(['sku' => '::sku::']);
+
+        $tierPrices = [
+            [
+                'website_id' => 1,
+                'quantity' => 1,
+                'customer_group' => 'GENERAL',
+                'price' => 10,
+            ],
+            [
+                'website_id' => 1,
+                'quantity' => 1,
+                'customer_group' => 'RETAIL',
+                'price' => 10,
+            ],
+        ];
+
+        /** @var CheckTierDuplicates $action */
+        $action = app(CheckTierDuplicates::class);
+        $action->check($model, $tierPrices);
+
+        $this->assertTrue(true, 'Passed');
+    }
+
+    #[Test]
+    public function it_throws_exception(): void
+    {
+        /** @var Price $model */
+        $model = Price::query()->create(['sku' => '::sku::']);
+
+        $tierPrices = [
+            [
+                'website_id' => 1,
+                'quantity' => 1,
+                'customer_group' => 'GENERAL',
+                'price' => 10,
+            ],
+            [
+                'website_id' => 1,
+                'quantity' => 1,
+                'customer_group' => 'GENERAL',
+                'price' => 20,
+            ],
+        ];
+
+        $this->expectException(DuplicateTierPriceException::class);
+
+        /** @var CheckTierDuplicates $action */
+        $action = app(CheckTierDuplicates::class);
+        $action->check($model, $tierPrices);
+    }
+}
diff --git a/tests/Actions/Utility/DeleteCurrentSpecialPricesTest.php b/tests/Actions/Utility/DeleteCurrentSpecialPricesTest.php
new file mode 100644
index 0000000..5150d0b
--- /dev/null
+++ b/tests/Actions/Utility/DeleteCurrentSpecialPricesTest.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Utility;
+
+use Illuminate\Http\Client\RequestException;
+use Illuminate\Support\Facades\Http;
+use JustBetter\MagentoPrices\Actions\Update\Sync\UpdateSpecialPrice;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class DeleteCurrentSpecialPricesTest extends TestCase
+{
+    #[Test]
+    public function it_removes_special_prices(): void
+    {
+        Http::fake([
+            'magento/rest/all/V1/products/special-price-information' => Http::response([
+                [
+                    'price',
+                ],
+            ]),
+            'magento/rest/all/V1/products/special-price-delete' => Http::response(),
+        ])->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'has_special' => true,
+            'special_prices' => [],
+        ]);
+
+        /** @var UpdateSpecialPrice $action */
+        $action = app(UpdateSpecialPrice::class);
+        $action->update($model);
+        $this->assertFalse($model->refresh()->has_special);
+    }
+
+    #[Test]
+    public function it_throws_exception_when_special_price_removal_fails(): void
+    {
+        Http::fake([
+            'magento/rest/all/V1/products/special-price-information' => Http::response([
+                [
+                    'price',
+                ],
+            ]),
+            'magento/rest/all/V1/products/special-price-delete' => Http::response(null, 500),
+        ])->preventStrayRequests();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'has_special' => true,
+            'special_prices' => [],
+        ]);
+
+        /** @var UpdateSpecialPrice $action */
+        $action = app(UpdateSpecialPrice::class);
+
+        $this->expectException(RequestException::class);
+
+        $action->update($model);
+    }
+}
diff --git a/tests/Actions/ImportCustomerGroupsTest.php b/tests/Actions/Utility/ImportCustomerGroupsTest.php
similarity index 83%
rename from tests/Actions/ImportCustomerGroupsTest.php
rename to tests/Actions/Utility/ImportCustomerGroupsTest.php
index 03970b4..1d29a6f 100644
--- a/tests/Actions/ImportCustomerGroupsTest.php
+++ b/tests/Actions/Utility/ImportCustomerGroupsTest.php
@@ -1,17 +1,18 @@
 <?php
 
-namespace JustBetter\MagentoPrices\Tests\Actions;
+namespace JustBetter\MagentoPrices\Tests\Actions\Utility;
 
 use Illuminate\Support\Facades\Http;
 use JustBetter\MagentoClient\Client\Magento;
-use JustBetter\MagentoPrices\Actions\ImportCustomerGroups;
-use JustBetter\MagentoPrices\Models\MagentoCustomerGroup;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
+use JustBetter\MagentoPrices\Actions\Utility\ImportCustomerGroups;
+use JustBetter\MagentoPrices\Models\CustomerGroup;
+use JustBetter\MagentoPrices\Models\Price;
 use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
 
 class ImportCustomerGroupsTest extends TestCase
 {
-    /** @test */
+    #[Test]
     public function it_can_import_customer_groups(): void
     {
         Magento::fake();
@@ -45,12 +46,12 @@ public function it_can_import_customer_groups(): void
         $action = app(ImportCustomerGroups::class);
         $action->import();
 
-        $count = MagentoCustomerGroup::query()->count();
+        $count = CustomerGroup::query()->count();
 
         $this->assertEquals(3, $count);
     }
 
-    /** @test */
+    #[Test]
     public function it_can_add_customer_groups(): void
     {
         Magento::fake();
@@ -80,13 +81,13 @@ public function it_can_add_customer_groups(): void
             ],
         ]);
 
-        MagentoCustomerGroup::query()->create([
+        CustomerGroup::query()->create([
             'code' => 'General',
             'data' => [],
         ]);
 
-        /** @var MagentoPrice $price */
-        $price = MagentoPrice::query()->create([
+        /** @var Price $price */
+        $price = Price::query()->create([
             'sku' => '1000',
             'update' => false,
         ]);
@@ -95,7 +96,7 @@ public function it_can_add_customer_groups(): void
         $action = app(ImportCustomerGroups::class);
         $action->import();
 
-        $count = MagentoCustomerGroup::query()->count();
+        $count = CustomerGroup::query()->count();
 
         $this->assertEquals(3, $count);
 
@@ -104,7 +105,7 @@ public function it_can_add_customer_groups(): void
         $this->assertTrue($price->update);
     }
 
-    /** @test */
+    #[Test]
     public function it_can_delete_customer_groups(): void
     {
         Magento::fake();
@@ -115,13 +116,13 @@ public function it_can_delete_customer_groups(): void
             ],
         ]);
 
-        MagentoCustomerGroup::query()->create([
+        CustomerGroup::query()->create([
             'code' => 'Delete',
             'data' => [],
         ]);
 
-        /** @var MagentoPrice $price */
-        $price = MagentoPrice::query()->create([
+        /** @var Price $price */
+        $price = Price::query()->create([
             'sku' => '1000',
             'sync' => false,
             'update' => false,
@@ -131,7 +132,7 @@ public function it_can_delete_customer_groups(): void
         $action = app(ImportCustomerGroups::class);
         $action->import();
 
-        $count = MagentoCustomerGroup::query()->count();
+        $count = CustomerGroup::query()->count();
 
         $this->assertEquals(0, $count);
 
diff --git a/tests/Actions/Utility/ProcessProductsWithMissingPricesTest.php b/tests/Actions/Utility/ProcessProductsWithMissingPricesTest.php
new file mode 100644
index 0000000..7777c49
--- /dev/null
+++ b/tests/Actions/Utility/ProcessProductsWithMissingPricesTest.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Utility;
+
+use Illuminate\Support\Facades\Bus;
+use Illuminate\Support\Facades\Http;
+use JustBetter\MagentoClient\Client\Magento;
+use JustBetter\MagentoPrices\Actions\Utility\ProcessProductsWithMissingPrices;
+use JustBetter\MagentoPrices\Jobs\Retrieval\RetrievePriceJob;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePriceJob;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePricesAsyncJob;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class ProcessProductsWithMissingPricesTest extends TestCase
+{
+    #[Test]
+    public function it_dispatches_update_jobs_for_missing_prices(): void
+    {
+        Magento::fake();
+        Bus::fake();
+
+        Http::fake([
+            'magento/rest/all/V1/products?fields=sku%2Cprice%2Ctype_id&searchCriteria%5BpageSize%5D=100&searchCriteria%5BcurrentPage%5D=1' => Http::response([
+                'items' => [
+                    [
+                        'sku' => '::sku_1::',
+                        'price' => 10,
+                        'type_id' => 'simple',
+                    ],
+                    [
+                        'sku' => '::sku_2::',
+                        'price' => 0,
+                        'type_id' => 'simple',
+                    ],
+                    [
+                        'sku' => '::sku_3::',
+                        'type_id' => 'simple',
+                    ],
+                ],
+            ]),
+        ])->preventStrayRequests();
+
+        Price::query()->create(['sku' => '::sku_3::']);
+
+        /** @var ProcessProductsWithMissingPrices $action */
+        $action = app(ProcessProductsWithMissingPrices::class);
+        $action->process();
+
+        Bus::assertDispatched(UpdatePriceJob::class, function (UpdatePriceJob $job): bool {
+            return $job->price->sku === '::sku_3::';
+        });
+
+        Bus::assertDispatched(RetrievePriceJob::class, function (RetrievePriceJob $job): bool {
+            return $job->sku === '::sku_2::';
+        });
+    }
+
+    #[Test]
+    public function it_dispatches_update_jobs_async(): void
+    {
+        config()->set('magento-prices.async', true);
+
+        Magento::fake();
+        Bus::fake();
+
+        Http::fake([
+            'magento/rest/all/V1/products?fields=sku%2Cprice%2Ctype_id&searchCriteria%5BpageSize%5D=100&searchCriteria%5BcurrentPage%5D=1' => Http::response([
+                'items' => [
+                    [
+                        'sku' => '::sku_1::',
+                        'price' => 10,
+                        'type_id' => 'simple',
+                    ],
+                    [
+                        'sku' => '::sku_2::',
+                        'price' => 0,
+                        'type_id' => 'simple',
+                    ],
+                ],
+            ]),
+        ])->preventStrayRequests();
+
+        Price::query()->create(['sku' => '::sku_2::']);
+
+        /** @var ProcessProductsWithMissingPrices $action */
+        $action = app(ProcessProductsWithMissingPrices::class);
+        $action->process();
+
+        Bus::assertDispatched(UpdatePricesAsyncJob::class, function (UpdatePricesAsyncJob $job): bool {
+            return $job->prices->pluck('sku')->toArray() === ['::sku_2::'];
+        });
+    }
+}
diff --git a/tests/Actions/Utility/RetrieveCustomerGroupsTest.php b/tests/Actions/Utility/RetrieveCustomerGroupsTest.php
new file mode 100644
index 0000000..386efb4
--- /dev/null
+++ b/tests/Actions/Utility/RetrieveCustomerGroupsTest.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Actions\Utility;
+
+use Illuminate\Support\Facades\Bus;
+use JustBetter\MagentoPrices\Actions\Utility\RetrieveCustomerGroups;
+use JustBetter\MagentoPrices\Exceptions\PriceUpdateException;
+use JustBetter\MagentoPrices\Jobs\Utility\ImportCustomerGroupsJob;
+use JustBetter\MagentoPrices\Models\CustomerGroup;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class RetrieveCustomerGroupsTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Bus::fake([ImportCustomerGroupsJob::class]);
+    }
+
+    #[Test]
+    public function it_dispatches_job_and_throws_exception(): void
+    {
+        $this->expectException(PriceUpdateException::class);
+
+        /** @var RetrieveCustomerGroups $action */
+        $action = app(RetrieveCustomerGroups::class);
+        $action->retrieve();
+
+        Bus::assertDispatched(ImportCustomerGroupsJob::class);
+    }
+
+    #[Test]
+    public function it_returns_groups(): void
+    {
+        CustomerGroup::query()->create(['code' => '::group::', 'data' => []]);
+
+        /** @var RetrieveCustomerGroups $action */
+        $action = app(RetrieveCustomerGroups::class);
+        $this->assertEquals(['::group::', 'ALL GROUPS'], $action->retrieve());
+
+        Bus::assertDispatched(ImportCustomerGroupsJob::class);
+    }
+
+    #[Test]
+    public function it_does_not_dispatch_import_job_twice(): void
+    {
+        CustomerGroup::query()->create(['code' => '::group::', 'data' => []]);
+
+        /** @var RetrieveCustomerGroups $action */
+        $action = app(RetrieveCustomerGroups::class);
+        $action->retrieve();
+        $action->retrieve();
+
+        Bus::assertDispatchedTimes(ImportCustomerGroupsJob::class, 1);
+    }
+}
diff --git a/tests/Commands/CommandDispatchTest.php b/tests/Commands/CommandDispatchTest.php
deleted file mode 100644
index 1319686..0000000
--- a/tests/Commands/CommandDispatchTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Commands;
-
-use Illuminate\Support\Facades\Bus;
-use JustBetter\MagentoPrices\Commands\MonitorWaitTimesCommand;
-use JustBetter\MagentoPrices\Commands\RetrievePricesCommand;
-use JustBetter\MagentoPrices\Commands\SearchMissingPricesCommand;
-use JustBetter\MagentoPrices\Commands\SyncPricesCommand;
-use JustBetter\MagentoPrices\Commands\UpdatePriceCommand;
-use JustBetter\MagentoPrices\Jobs\MonitorWaitTimesJob;
-use JustBetter\MagentoPrices\Jobs\RetrievePriceJob;
-use JustBetter\MagentoPrices\Jobs\RetrievePricesJob;
-use JustBetter\MagentoPrices\Jobs\SyncMissingPricesJob;
-use JustBetter\MagentoPrices\Jobs\SyncPricesJob as SyncPricesJob;
-use JustBetter\MagentoPrices\Jobs\UpdatePriceJob;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class CommandDispatchTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        Bus::fake();
-    }
-
-    /** @dataProvider dataProvider */
-    public function test_simple_commands(string $command, string $job, array $args = []): void
-    {
-        $this->artisan($command, $args);
-
-        Bus::assertDispatched($job);
-    }
-
-    public function test_retrieve_price(): void
-    {
-        $this->artisan(RetrievePricesCommand::class, ['sku' => '::sku::']);
-
-        Bus::assertDispatched(RetrievePriceJob::class);
-    }
-
-    public function test_retrieve_prices(): void
-    {
-        $this->artisan(RetrievePricesCommand::class);
-
-        Bus::assertDispatched(RetrievePricesJob::class);
-    }
-
-    public function test_update_price(): void
-    {
-        $this->artisan(UpdatePriceCommand::class, ['sku' => '::sku::']);
-
-        Bus::assertDispatched(UpdatePriceJob::class);
-    }
-
-    public static function dataProvider(): array
-    {
-        return [
-            'Sync prices' => [
-                SyncPricesCommand::class,
-                SyncPricesJob::class,
-            ],
-            'Sync prices sync' => [
-                SyncPricesCommand::class,
-                SyncPricesJob::class,
-                ['--sync' => true],
-            ],
-            'Search missing' => [
-                SearchMissingPricesCommand::class,
-                SyncMissingPricesJob::class,
-            ],
-            'Monitor wait times' => [
-                MonitorWaitTimesCommand::class,
-                MonitorWaitTimesJob::class,
-            ],
-        ];
-    }
-}
diff --git a/tests/Commands/ImportCustomerGroupsCommandTest.php b/tests/Commands/ImportCustomerGroupsCommandTest.php
deleted file mode 100644
index 6109ff9..0000000
--- a/tests/Commands/ImportCustomerGroupsCommandTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Commands;
-
-use Illuminate\Support\Facades\Bus;
-use Illuminate\Testing\PendingCommand;
-use JustBetter\MagentoPrices\Commands\ImportCustomerGroupsCommand;
-use JustBetter\MagentoPrices\Jobs\ImportCustomerGroupsJob;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class ImportCustomerGroupsCommandTest extends TestCase
-{
-    /** @test */
-    public function it_can_import_customer_groups(): void
-    {
-        Bus::fake();
-
-        /** @var PendingCommand $command */
-        $command = $this->artisan(ImportCustomerGroupsCommand::class);
-
-        $command
-            ->assertSuccessful()
-            ->run();
-
-        Bus::assertDispatched(ImportCustomerGroupsJob::class);
-    }
-}
diff --git a/tests/Commands/ProcessPricesCommandTest.php b/tests/Commands/ProcessPricesCommandTest.php
new file mode 100644
index 0000000..675b715
--- /dev/null
+++ b/tests/Commands/ProcessPricesCommandTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Commands;
+
+use Illuminate\Support\Facades\Bus;
+use JustBetter\MagentoPrices\Commands\ProcessPricesCommand;
+use JustBetter\MagentoPrices\Jobs\ProcessPricesJob;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class ProcessPricesCommandTest extends TestCase
+{
+    #[Test]
+    public function it_dispatches_job(): void
+    {
+        Bus::fake([ProcessPricesJob::class]);
+
+        $this->artisan(ProcessPricesCommand::class);
+
+        Bus::assertDispatched(ProcessPricesJob::class);
+    }
+}
diff --git a/tests/Commands/Retrieval/RetrieveAllPricesCommandTest.php b/tests/Commands/Retrieval/RetrieveAllPricesCommandTest.php
new file mode 100644
index 0000000..3332e2f
--- /dev/null
+++ b/tests/Commands/Retrieval/RetrieveAllPricesCommandTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Commands\Retrieval;
+
+use Illuminate\Support\Facades\Bus;
+use JustBetter\MagentoPrices\Commands\Retrieval\RetrieveAllPricesCommand;
+use JustBetter\MagentoPrices\Jobs\Retrieval\RetrieveAllPricesJob;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class RetrieveAllPricesCommandTest extends TestCase
+{
+    #[Test]
+    public function it_dispatches_job(): void
+    {
+        Bus::fake([RetrieveAllPricesJob::class]);
+
+        $this->artisan(RetrieveAllPricesCommand::class);
+
+        Bus::assertDispatched(RetrieveAllPricesJob::class);
+    }
+}
diff --git a/tests/Commands/Retrieval/RetrievePriceCommandTest.php b/tests/Commands/Retrieval/RetrievePriceCommandTest.php
new file mode 100644
index 0000000..71dca9b
--- /dev/null
+++ b/tests/Commands/Retrieval/RetrievePriceCommandTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Commands\Retrieval;
+
+use Illuminate\Support\Facades\Bus;
+use JustBetter\MagentoPrices\Commands\Retrieval\RetrievePriceCommand;
+use JustBetter\MagentoPrices\Jobs\Retrieval\RetrievePriceJob;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class RetrievePriceCommandTest extends TestCase
+{
+    #[Test]
+    public function it_dispatches_job(): void
+    {
+        Bus::fake([RetrievePriceJob::class]);
+
+        $this->artisan(RetrievePriceCommand::class, ['sku' => '::sku::']);
+
+        Bus::assertDispatched(RetrievePriceJob::class);
+    }
+}
diff --git a/tests/Commands/Update/UpdateAllPricesCommandTest.php b/tests/Commands/Update/UpdateAllPricesCommandTest.php
new file mode 100644
index 0000000..42b7218
--- /dev/null
+++ b/tests/Commands/Update/UpdateAllPricesCommandTest.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Commands\Update;
+
+use Illuminate\Support\Facades\Bus;
+use JustBetter\MagentoPrices\Commands\Update\UpdateAllPricesCommand;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePriceJob;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use JustBetter\MagentoProducts\Models\MagentoProduct;
+use PHPUnit\Framework\Attributes\Test;
+
+class UpdateAllPricesCommandTest extends TestCase
+{
+    #[Test]
+    public function it_dispatches_jobs(): void
+    {
+        Bus::fake([UpdatePriceJob::class]);
+
+        MagentoProduct::query()->create(['sku' => '::sku_1::', 'exists_in_magento' => true]);
+        MagentoProduct::query()->create(['sku' => '::sku_2::', 'exists_in_magento' => false]);
+        MagentoProduct::query()->create(['sku' => '::sku_3::', 'exists_in_magento' => true]);
+
+        Price::query()->create(['sku' => '::sku_1::']);
+        Price::query()->create(['sku' => '::sku_2::']);
+        Price::query()->create(['sku' => '::sku_3::']);
+        Price::query()->create(['sku' => '::sku_4::']);
+
+        $this->artisan(UpdateAllPricesCommand::class);
+
+        Bus::assertDispatchedTimes(UpdatePriceJob::class, 2);
+    }
+}
diff --git a/tests/Commands/Update/UpdatePriceCommandTest.php b/tests/Commands/Update/UpdatePriceCommandTest.php
new file mode 100644
index 0000000..fa63f15
--- /dev/null
+++ b/tests/Commands/Update/UpdatePriceCommandTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Commands\Update;
+
+use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Support\Facades\Bus;
+use JustBetter\MagentoPrices\Commands\Update\UpdatePriceCommand;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePriceJob;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class UpdatePriceCommandTest extends TestCase
+{
+    #[Test]
+    public function it_dispatches_job(): void
+    {
+        Bus::fake([UpdatePriceJob::class]);
+
+        Price::query()->create(['sku' => '::sku_1::']);
+
+        $this->artisan(UpdatePriceCommand::class, [
+            'sku' => '::sku_1::',
+        ]);
+
+        Bus::assertDispatched(UpdatePriceJob::class);
+    }
+
+    #[Test]
+    public function it_throws_exception_on_missing_price(): void
+    {
+        $this->expectException(ModelNotFoundException::class);
+
+        $this->artisan(UpdatePriceCommand::class, [
+            'sku' => '::some-non-existent-sku::',
+        ]);
+    }
+}
diff --git a/tests/Commands/Utility/ImportCustomerGroupsCommandTest.php b/tests/Commands/Utility/ImportCustomerGroupsCommandTest.php
new file mode 100644
index 0000000..8775e21
--- /dev/null
+++ b/tests/Commands/Utility/ImportCustomerGroupsCommandTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Commands\Utility;
+
+use Illuminate\Support\Facades\Bus;
+use JustBetter\MagentoPrices\Commands\Utility\ImportCustomerGroupsCommand;
+use JustBetter\MagentoPrices\Jobs\Utility\ImportCustomerGroupsJob;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class ImportCustomerGroupsCommandTest extends TestCase
+{
+    #[Test]
+    public function it_dispatches_job(): void
+    {
+        Bus::fake([ImportCustomerGroupsJob::class]);
+
+        $this->artisan(ImportCustomerGroupsCommand::class);
+
+        Bus::assertDispatched(ImportCustomerGroupsJob::class);
+    }
+}
diff --git a/tests/Commands/Utility/ProcessProductsWithMissingPricesCommandTest.php b/tests/Commands/Utility/ProcessProductsWithMissingPricesCommandTest.php
new file mode 100644
index 0000000..36e387a
--- /dev/null
+++ b/tests/Commands/Utility/ProcessProductsWithMissingPricesCommandTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Commands\Utility;
+
+use Illuminate\Support\Facades\Bus;
+use JustBetter\MagentoPrices\Commands\Utility\ProcessProductsWithMissingPricesCommand;
+use JustBetter\MagentoPrices\Jobs\Utility\ProcessProductsWithMissingPricesJob;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class ProcessProductsWithMissingPricesCommandTest extends TestCase
+{
+    #[Test]
+    public function it_dispatches_job(): void
+    {
+        Bus::fake([ProcessProductsWithMissingPricesJob::class]);
+
+        $this->artisan(ProcessProductsWithMissingPricesCommand::class);
+
+        Bus::assertDispatched(ProcessProductsWithMissingPricesJob::class);
+    }
+}
diff --git a/tests/Data/DataObjectsTest.php b/tests/Data/DataObjectsTest.php
deleted file mode 100644
index 01dd90e..0000000
--- a/tests/Data/DataObjectsTest.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Data;
-
-use Brick\Money\Context\CustomContext;
-use Brick\Money\Money;
-use JustBetter\MagentoPrices\Data\BasePriceData;
-use JustBetter\MagentoPrices\Data\SpecialPriceData;
-use JustBetter\MagentoPrices\Data\TierPriceData;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class DataObjectsTest extends TestCase
-{
-    public function test_base_price_data_constructor_order(): void
-    {
-        $price = Money::of(10, 'EUR');
-        $storeId = 1;
-
-        $data = new BasePriceData($price, $storeId);
-
-        $this->assertEquals($price, $data->getPrice());
-        $this->assertEquals($storeId, $data->getStoreId());
-    }
-
-    public function test_base_price_price_parse(): void
-    {
-        $price = Money::of(10,
-            config('magento-prices.currency'),
-            new CustomContext(config('magento-prices.precision')),
-            config('magento-prices.rounding_mode')
-        );
-
-        $data = new BasePriceData($price, 0);
-
-        $data->parsePrice(10);
-
-        $this->assertEquals($price, $data->getPrice());
-    }
-
-    public function test_base_price_data_setters(): void
-    {
-        $price = Money::of(10, 'EUR');
-        $storeId = 1;
-
-        $data = new BasePriceData($price, $storeId);
-
-        $price = $price->plus(10);
-
-        $data->setPrice($price);
-        $data->setStoreId(10);
-
-        $this->assertEquals($price, $data->getPrice());
-        $this->assertEquals(10, $data->getStoreId());
-    }
-
-    public function test_base_price_to_array(): void
-    {
-        $price = Money::of(1.12, 'EUR');
-        $storeId = 0;
-
-        $data = new BasePriceData($price, $storeId);
-
-        $this->assertEquals([
-            'storeId' => 0,
-            'price' => 1.12,
-        ], $data->toArray());
-    }
-
-    public function test_tier_prices_constructor_order(): void
-    {
-        $storeId = 1;
-        $quantity = 1;
-        $groupId = '::group::';
-        $priceType = 'fixed';
-        $price = Money::of(10, 'EUR');
-
-        $data = new TierPriceData($groupId, $price, $quantity, $storeId, $priceType);
-
-        $this->assertEquals($storeId, $data->getStoreId());
-        $this->assertEquals($quantity, $data->getQuantity());
-        $this->assertEquals($groupId, $data->getGroupId());
-        $this->assertEquals($priceType, $data->getPriceType());
-        $this->assertEquals($price, $data->getPrice());
-    }
-
-    public function test_tier_prices_default_values(): void
-    {
-        $storeId = 0;
-        $quantity = 1;
-        $groupId = '::group::';
-        $priceType = 'fixed';
-        $price = Money::of(10, 'EUR');
-
-        $data = new TierPriceData($groupId, $price);
-
-        $this->assertEquals($storeId, $data->getStoreId());
-        $this->assertEquals($quantity, $data->getQuantity());
-        $this->assertEquals($groupId, $data->getGroupId());
-        $this->assertEquals($priceType, $data->getPriceType());
-        $this->assertEquals($price, $data->getPrice());
-    }
-
-    public function test_tier_prices_setters(): void
-    {
-        $groupId = '::group::';
-        $price = Money::of(10, 'EUR');
-
-        $data = new TierPriceData($groupId, $price);
-
-        $price = $price->plus(10);
-
-        $data->setStoreId(10);
-        $data->setPrice($price);
-        $data->setQuantity(10);
-        $data->setGroupId('::new_group::');
-        $data->setPriceType('::some_type::');
-
-        $this->assertEquals(10, $data->getStoreId());
-        $this->assertEquals(10, $data->getQuantity());
-        $this->assertEquals('::new_group::', $data->getGroupId());
-        $this->assertEquals('::some_type::', $data->getPriceType());
-        $this->assertEquals($price, $data->getPrice());
-    }
-
-    public function test_tier_prices_identifier(): void
-    {
-        $groupId = '::group::';
-        $price = Money::of(10, 'EUR');
-
-        $data = new TierPriceData($groupId, $price);
-
-        $this->assertEquals('0-1-::group::', $data->getIdentifier());
-    }
-
-    public function test_tier_prices_to_array(): void
-    {
-        $groupId = '::group::';
-        $price = Money::of(10, 'EUR');
-
-        $data = new TierPriceData($groupId, $price);
-
-        $this->assertEquals([
-            'storeId' => 0,
-            'quantity' => 1,
-            'price' => 10.00,
-            'customer_group' => $groupId,
-        ], $data->toArray());
-    }
-
-    public function test_special_price(): void
-    {
-        $from = now()->subMonth();
-        $to = now();
-
-        $price = Money::of(10,
-            config('magento-prices.currency'),
-            new CustomContext(config('magento-prices.precision')),
-            config('magento-prices.rounding_mode')
-        );
-
-        $specialPrice = new SpecialPriceData($price);
-
-        $specialPrice->setPrice($price);
-        $specialPrice->setStoreId(1);
-        $specialPrice->setFrom($from);
-        $specialPrice->setTo($to);
-        $specialPrice->parsePrice(11);
-
-        $this->assertEquals([
-            'storeId' => 1,
-            'price' => '11.0000',
-            'price_from' => $from->toDateTimeString(),
-            'price_to' => $to->toDateTimeString(),
-        ], $specialPrice->toArray());
-    }
-}
diff --git a/tests/Data/PriceDataTest.php b/tests/Data/PriceDataTest.php
index 05b2ee8..b9e96e6 100644
--- a/tests/Data/PriceDataTest.php
+++ b/tests/Data/PriceDataTest.php
@@ -2,192 +2,53 @@
 
 namespace JustBetter\MagentoPrices\Tests\Data;
 
-use Brick\Money\Money;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Support\Collection;
-use JustBetter\MagentoPrices\Data\BasePriceData;
+use Illuminate\Validation\ValidationException;
 use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Data\TierPriceData;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
 use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
 
 class PriceDataTest extends TestCase
 {
-    use RefreshDatabase;
-
-    protected PriceData $data;
-
-    protected function setUp(): void
+    #[Test]
+    public function it_passes_simple_rules(): void
     {
-        parent::setUp();
-
-        $basePrices = collect([
-            new BasePriceData(Money::of(10, 'EUR'), 0),
-            new BasePriceData(Money::of(11, 'EUR'), 1),
-            new BasePriceData(Money::of(12, 'EUR'), 2),
+        PriceData::of([
+            'sku' => '::sku::',
         ]);
 
-        $tierPrices = collect([
-            new TierPriceData('::group_1::', Money::of(10, 'EUR'), 0),
-            new TierPriceData('::group_1::', Money::of(8, 'EUR'), 10),
-            new TierPriceData('::group_2::', Money::of(5, 'EUR'), 0),
-            new TierPriceData('::group_2::', Money::of(2.5, 'EUR'), 10),
-        ]);
-
-        $this->data = new PriceData('::sku::', $basePrices, $tierPrices);
-    }
-
-    public function test_it_creates_model(): void
-    {
-        $this->assertDatabaseCount(MagentoPrice::class, 0);
-
-        $this->data->getModel();
-
-        $this->assertDatabaseCount(MagentoPrice::class, 1);
-    }
-
-    public function test_it_creates_model_once(): void
-    {
-        $this->assertDatabaseCount(MagentoPrice::class, 0);
-
-        $this->data->getModel();
-        $this->data->getModel();
-        $this->data->getModel();
-
-        $this->assertDatabaseCount(MagentoPrice::class, 1);
-    }
-
-    public function test_it_creates_array(): void
-    {
-        $this->assertEquals([
-            'base_prices' => collect([
-                [
-                    'storeId' => 0,
-                    'price' => 10.00,
-                ],
-                [
-                    'storeId' => 1,
-                    'price' => 11.00,
-                ],
-                [
-                    'storeId' => 2,
-                    'price' => 12.00,
-                ],
-            ]),
-            'tier_prices' => collect([
-                [
-                    'storeId' => 0,
-                    'quantity' => 0,
-                    'price' => 10.00,
-                    'customer_group' => '::group_1::',
-                ],
-                [
-                    'storeId' => 0,
-                    'quantity' => 10,
-                    'price' => 8.00,
-                    'customer_group' => '::group_1::',
-                ],
-                [
-                    'storeId' => 0,
-                    'quantity' => 0,
-                    'price' => 5.00,
-                    'customer_group' => '::group_2::',
-                ],
-                [
-                    'storeId' => 0,
-                    'quantity' => 10,
-                    'price' => 2.50,
-                    'customer_group' => '::group_2::',
-                ],
-            ]),
-            'special_prices' => collect(),
-        ], $this->data->toArray());
+        $this->assertTrue(true, 'No exception thrown');
     }
 
-    public function test_it_gets_magento_base_prices(): void
+    #[Test]
+    public function it_fails_rules(): void
     {
-        $this->assertEquals([
-            [
-                'sku' => '::sku::',
-                'price' => 10.0,
-                'store_id' => 0,
-            ],
-            [
-                'sku' => '::sku::',
-                'price' => 11.0,
-                'store_id' => 1,
-            ],
-            [
-                'sku' => '::sku::',
-                'price' => 12.0,
-                'store_id' => 2,
-            ],
-        ], $this->data->getMagentoBasePrices());
-    }
+        $this->expectException(ValidationException::class);
 
-    public function test_it_gets_magento_tier_prices(): void
-    {
-        $this->assertEquals([
-            [
-                'sku' => '::sku::',
-                'price' => 10.0,
-                'website_id' => 0,
-                'quantity' => 1,
-                'customer_group' => '::group_1::',
-                'price_type' => 'fixed',
-            ],
-            [
-                'sku' => '::sku::',
-                'price' => 8.0,
-                'website_id' => 0,
-                'quantity' => 10,
-                'customer_group' => '::group_1::',
-                'price_type' => 'fixed',
-            ],
-            [
-                'sku' => '::sku::',
-                'price' => 5.0,
-                'website_id' => 0,
-                'quantity' => 1,
-                'customer_group' => '::group_2::',
-                'price_type' => 'fixed',
-            ],
-            [
-                'sku' => '::sku::',
-                'price' => 2.5,
-                'website_id' => 0,
-                'quantity' => 10,
-                'customer_group' => '::group_2::',
-                'price_type' => 'fixed',
-            ],
-        ], $this->data->getMagentoTierPrices());
+        PriceData::of([]);
     }
 
-    public function test_it_compares_base_price_data(): void
+    #[Test]
+    public function it_calculates_checksum(): void
     {
-        $newData = clone $this->data;
-
-        $this->assertTrue($this->data->equals($newData));
-
-        /* @phpstan-ignore-next-line */
-        $newData->basePrices = new Collection([
-            new TierPriceData('::group_1::', Money::of(10, 'EUR'), 0),
+        $data = PriceData::of([
+            'sku' => '::sku::',
         ]);
 
-        $this->assertFalse($this->data->equals($newData));
+        $this->assertEquals('b5a9aed3556af7b01952f7fdcd28fdd8', $data->checksum());
     }
 
-    public function test_it_compares_base_tier_data(): void
+    #[Test]
+    public function it_handles_array_operations(): void
     {
-        $newData = clone $this->data;
+        $data = PriceData::of([
+            'sku' => '::sku::',
+        ]);
 
-        $this->assertTrue($this->data->equals($newData));
+        $data['base_prices'] = [];
 
-        /* @phpstan-ignore-next-line */
-        $newData->tierPrices = new Collection([
-            new BasePriceData(Money::of(10, 'EUR'), 0),
-        ]);
+        $this->assertEquals([], $data['base_prices']);
+        unset($data['base_prices']);
 
-        $this->assertFalse($this->data->equals($newData));
+        $this->assertNull($data['base_prices']);
     }
 }
diff --git a/tests/Fakes/FakeNullRepository.php b/tests/Fakes/FakeNullRepository.php
new file mode 100644
index 0000000..9bbc2fa
--- /dev/null
+++ b/tests/Fakes/FakeNullRepository.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Fakes;
+
+use JustBetter\MagentoPrices\Data\PriceData;
+use JustBetter\MagentoPrices\Repository\Repository;
+
+class FakeNullRepository extends Repository
+{
+    public function retrieve(string $sku): ?PriceData
+    {
+        return null;
+    }
+}
diff --git a/tests/Fakes/FakeRepository.php b/tests/Fakes/FakeRepository.php
new file mode 100644
index 0000000..501286e
--- /dev/null
+++ b/tests/Fakes/FakeRepository.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Fakes;
+
+use JustBetter\MagentoPrices\Data\PriceData;
+use JustBetter\MagentoPrices\Repository\Repository;
+
+class FakeRepository extends Repository
+{
+    public function retrieve(string $sku): ?PriceData
+    {
+        return PriceData::of([
+            'sku' => $sku,
+            'base_prices' => [
+                [
+                    'store_id' => 0,
+                    'price' => 10,
+                ],
+                [
+                    'store_id' => 2,
+                    'price' => 19,
+                ],
+            ],
+            'tier_prices' => [
+                [
+                    'website_id' => 0,
+                    'customer_group' => 'group_1',
+                    'price_type' => 'fixed',
+                    'quantity' => 1,
+                    'price' => 8,
+                ],
+                [
+                    'website_id' => 0,
+                    'customer_group' => '4040',
+                    'price_type' => 'group_2',
+                    'quantity' => 1,
+                    'price' => 7,
+                ],
+            ],
+            'special_prices' => [
+                [
+                    'store_id' => 0,
+                    'price' => 5,
+                    'price_from' => now()->subWeek()->toDateString(),
+                    'price_to' => now()->addWeek()->toDateString(),
+                ],
+            ],
+        ]);
+    }
+}
diff --git a/tests/Feature/RetrievePricesJobTest.php b/tests/Feature/RetrievePricesJobTest.php
deleted file mode 100644
index cdab2e8..0000000
--- a/tests/Feature/RetrievePricesJobTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Feature;
-
-use JustBetter\MagentoPrices\Commands\RetrievePricesCommand;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-use JustBetter\MagentoPrices\Tests\TestCase;
-use JustBetter\MagentoProducts\Contracts\ChecksMagentoExistence;
-use Mockery\MockInterface;
-
-class RetrievePricesJobTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->mock(ChecksMagentoExistence::class, function (MockInterface $mock) {
-            $mock->shouldReceive('exists')
-                ->andReturnTrue();
-        });
-    }
-
-    public function test_it_retrieves_all(): void
-    {
-        $this->artisan(RetrievePricesCommand::class);
-
-        $prices = MagentoPrice::all();
-
-        $this->assertCount(2, $prices);
-    }
-
-    public function test_it_retrieves_by_date(): void
-    {
-        $this->artisan(RetrievePricesCommand::class, ['--date' => 'today']);
-
-        $prices = MagentoPrice::all();
-
-        $this->assertCount(1, $prices);
-    }
-}
diff --git a/tests/Feature/UpdatePricesJobTest.php b/tests/Feature/UpdatePricesJobTest.php
deleted file mode 100644
index 2d94150..0000000
--- a/tests/Feature/UpdatePricesJobTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Feature;
-
-use Illuminate\Bus\PendingBatch;
-use Illuminate\Support\Facades\Bus;
-use JustBetter\MagentoPrices\Commands\RetrievePricesCommand;
-use JustBetter\MagentoPrices\Commands\UpdatePriceCommand;
-use JustBetter\MagentoPrices\Jobs\UpdateMagentoBasePricesJob;
-use JustBetter\MagentoPrices\Tests\TestCase;
-use JustBetter\MagentoProducts\Contracts\ChecksMagentoExistence;
-use Mockery\MockInterface;
-
-class UpdatePricesJobTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->mock(ChecksMagentoExistence::class, function (MockInterface $mock) {
-            $mock->shouldReceive('exists')
-                ->andReturnTrue();
-        });
-
-        $this->artisan(RetrievePricesCommand::class);
-    }
-
-    public function test_it_updates(): void
-    {
-        Bus::fake([UpdateMagentoBasePricesJob::class]);
-
-        $this->artisan(UpdatePriceCommand::class, ['sku' => '123']);
-
-        Bus::assertBatched(function (PendingBatch $batch) {
-            foreach ($batch->jobs as $job) {
-                if ($job instanceof UpdateMagentoBasePricesJob) {
-                    return true;
-                }
-            }
-
-            return false;
-        });
-    }
-}
diff --git a/tests/Helpers/MoneyHelperTest.php b/tests/Helpers/MoneyHelperTest.php
deleted file mode 100644
index 5afca2a..0000000
--- a/tests/Helpers/MoneyHelperTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Helpers;
-
-use Brick\Math\RoundingMode;
-use JustBetter\MagentoPrices\Helpers\MoneyHelper;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class MoneyHelperTest extends TestCase
-{
-    /** @dataProvider provider */
-    public function test_it_creates_money(float $amount, string $method, ?float $expectedAmount = null): void
-    {
-        config()->set('laravel-magento-prices.currency', 'EUR');
-        config()->set('laravel-magento-prices.precision', 4);
-        config()->set('laravel-magento-prices.rounding_mode', RoundingMode::HALF_UP);
-
-        /** @var MoneyHelper $helper */
-        $helper = app(MoneyHelper::class);
-
-        $money = $helper->getMoney($amount, $method);
-
-        $this->assertEquals($expectedAmount ?? $amount, $money->getAmount()->toFloat());
-    }
-
-    public static function provider(): array
-    {
-        return [
-            [
-                'amount' => 10,
-                'method' => 'of',
-            ],
-            [
-                'amount' => 1000,
-                'method' => 'ofMinor',
-                'expectedAmount' => 10,
-            ],
-            [
-                'amount' => 1.1234,
-                'method' => 'of',
-            ],
-            [
-                'amount' => 112,
-                'method' => 'ofMinor',
-                'expectedAmount' => 1.12,
-            ],
-        ];
-    }
-}
diff --git a/tests/Jobs/ImportCustomerGroupsJobTest.php b/tests/Jobs/ImportCustomerGroupsJobTest.php
deleted file mode 100644
index 98f26d1..0000000
--- a/tests/Jobs/ImportCustomerGroupsJobTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Jobs;
-
-use JustBetter\MagentoPrices\Contracts\ImportsCustomerGroups;
-use JustBetter\MagentoPrices\Jobs\ImportCustomerGroupsJob;
-use JustBetter\MagentoPrices\Tests\TestCase;
-use Mockery\MockInterface;
-
-class ImportCustomerGroupsJobTest extends TestCase
-{
-    /** @test */
-    public function it_can_import_customer_groups(): void
-    {
-        $this->mock(ImportsCustomerGroups::class, function (MockInterface $mock): void {
-            $mock
-                ->shouldReceive('import')
-                ->once();
-        });
-
-        ImportCustomerGroupsJob::dispatch();
-    }
-}
diff --git a/tests/Jobs/MonitorWaitTimesJobTest.php b/tests/Jobs/MonitorWaitTimesJobTest.php
deleted file mode 100644
index 414ed9d..0000000
--- a/tests/Jobs/MonitorWaitTimesJobTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Jobs;
-
-use JustBetter\MagentoPrices\Contracts\MonitorsWaitTimes;
-use JustBetter\MagentoPrices\Jobs\MonitorWaitTimesJob;
-use JustBetter\MagentoPrices\Tests\TestCase;
-use Mockery\MockInterface;
-
-class MonitorWaitTimesJobTest extends TestCase
-{
-    public function test_it_calls_action(): void
-    {
-        $this->mock(MonitorsWaitTimes::class, function (MockInterface $mock) {
-            $mock->shouldReceive('monitor')->once();
-        });
-
-        MonitorWaitTimesJob::dispatchSync();
-    }
-}
diff --git a/tests/Jobs/ProcessPriceJobTest.php b/tests/Jobs/ProcessPriceJobTest.php
deleted file mode 100644
index a319396..0000000
--- a/tests/Jobs/ProcessPriceJobTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Jobs;
-
-use JustBetter\MagentoPrices\Contracts\ProcessesPrice;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Jobs\ProcessPriceJob;
-use JustBetter\MagentoPrices\Tests\TestCase;
-use Mockery\MockInterface;
-
-class ProcessPriceJobTest extends TestCase
-{
-    public function test_it_calls_action(): void
-    {
-        $this->mock(ProcessesPrice::class, function (MockInterface $mock) {
-            $mock->shouldReceive('process')->once();
-        });
-
-        ProcessPriceJob::dispatchSync(new PriceData('::sku::', collect()));
-    }
-
-    public function test_queue_attributes(): void
-    {
-        $job = new ProcessPriceJob(new PriceData('::sku::', collect()));
-
-        $this->assertEquals('::sku::', $job->uniqueId());
-        $this->assertEquals(['::sku::'], $job->tags());
-    }
-}
diff --git a/tests/Jobs/ProcessPricesJobTest.php b/tests/Jobs/ProcessPricesJobTest.php
new file mode 100644
index 0000000..3d66522
--- /dev/null
+++ b/tests/Jobs/ProcessPricesJobTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Jobs;
+
+use JustBetter\MagentoPrices\Contracts\ProcessesPrices;
+use JustBetter\MagentoPrices\Jobs\ProcessPricesJob;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use Mockery\MockInterface;
+use PHPUnit\Framework\Attributes\Test;
+
+class ProcessPricesJobTest extends TestCase
+{
+    #[Test]
+    public function it_calls_action(): void
+    {
+        $this->mock(ProcessesPrices::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('process')->once();
+        });
+
+        ProcessPricesJob::dispatch();
+    }
+}
diff --git a/tests/Jobs/Retrieval/RetrieveAllPricesJobTest.php b/tests/Jobs/Retrieval/RetrieveAllPricesJobTest.php
new file mode 100644
index 0000000..af9df8e
--- /dev/null
+++ b/tests/Jobs/Retrieval/RetrieveAllPricesJobTest.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Jobs\Retrieval;
+
+use JustBetter\MagentoPrices\Contracts\Retrieval\RetrievesPrice;
+use JustBetter\MagentoPrices\Jobs\Retrieval\RetrievePriceJob;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use Mockery\MockInterface;
+use PHPUnit\Framework\Attributes\Test;
+
+class RetrieveAllPricesJobTest extends TestCase
+{
+    #[Test]
+    public function it_calls_action(): void
+    {
+        $this->mock(RetrievesPrice::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('retrieve')->once();
+        });
+
+        RetrievePriceJob::dispatch('::sku::', false);
+    }
+
+    #[Test]
+    public function it_has_unique_id(): void
+    {
+        $job = new RetrievePriceJob('::sku::', false);
+
+        $this->assertEquals('::sku::', $job->uniqueId());
+    }
+
+    #[Test]
+    public function it_has_tags(): void
+    {
+        $job = new RetrievePriceJob('::sku::', false);
+
+        $this->assertEquals(['::sku::'], $job->tags());
+    }
+}
diff --git a/tests/Jobs/Retrieval/RetrievePriceJobTest.php b/tests/Jobs/Retrieval/RetrievePriceJobTest.php
new file mode 100644
index 0000000..2da980a
--- /dev/null
+++ b/tests/Jobs/Retrieval/RetrievePriceJobTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Jobs\Retrieval;
+
+use JustBetter\MagentoPrices\Contracts\Retrieval\RetrievesAllPrices;
+use JustBetter\MagentoPrices\Jobs\Retrieval\RetrieveAllPricesJob;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use Mockery\MockInterface;
+use PHPUnit\Framework\Attributes\Test;
+
+class RetrievePriceJobTest extends TestCase
+{
+    #[Test]
+    public function it_calls_action(): void
+    {
+        $this->mock(RetrievesAllPrices::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('retrieve')->once();
+        });
+
+        RetrieveAllPricesJob::dispatch();
+    }
+}
diff --git a/tests/Jobs/Retrieval/SavePriceJobTest.php b/tests/Jobs/Retrieval/SavePriceJobTest.php
new file mode 100644
index 0000000..9a5deb4
--- /dev/null
+++ b/tests/Jobs/Retrieval/SavePriceJobTest.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Jobs\Retrieval;
+
+use JustBetter\MagentoPrices\Contracts\Retrieval\SavesPrice;
+use JustBetter\MagentoPrices\Data\PriceData;
+use JustBetter\MagentoPrices\Jobs\Retrieval\SavePriceJob;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use Mockery\MockInterface;
+use PHPUnit\Framework\Attributes\Test;
+
+class SavePriceJobTest extends TestCase
+{
+    #[Test]
+    public function it_calls_action(): void
+    {
+        $this->mock(SavesPrice::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('save')->once();
+        });
+
+        $priceData = PriceData::of(['sku' => '::sku::']);
+
+        SavePriceJob::dispatch($priceData, false);
+    }
+
+    #[Test]
+    public function it_has_unique_id(): void
+    {
+        $priceData = PriceData::of(['sku' => '::sku::']);
+
+        $job = new SavePriceJob($priceData, false);
+
+        $this->assertEquals('::sku::', $job->uniqueId());
+    }
+
+    #[Test]
+    public function it_has_tags(): void
+    {
+        $priceData = PriceData::of(['sku' => '::sku::']);
+
+        $job = new SavePriceJob($priceData, false);
+
+        $this->assertEquals(['::sku::'], $job->tags());
+    }
+}
diff --git a/tests/Jobs/RetrievePriceJobTest.php b/tests/Jobs/RetrievePriceJobTest.php
deleted file mode 100644
index 6e85055..0000000
--- a/tests/Jobs/RetrievePriceJobTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Jobs;
-
-use Illuminate\Support\Facades\Bus;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Jobs\ProcessPriceJob;
-use JustBetter\MagentoPrices\Jobs\RetrievePriceJob;
-use JustBetter\MagentoPrices\Retriever\DummyPriceRetriever;
-use JustBetter\MagentoPrices\Tests\TestCase;
-use Mockery\MockInterface;
-
-class RetrievePriceJobTest extends TestCase
-{
-    public function test_it_dispatches_process_job(): void
-    {
-        Bus::fake([ProcessPriceJob::class]);
-
-        config()->set('magento-prices.retrievers.price', DummyPriceRetriever::class);
-
-        $this->mock(DummyPriceRetriever::class, function (MockInterface $mock) {
-            $mock->shouldReceive('retrieve')
-                ->andReturn(new PriceData('::sku::', collect()));
-        });
-
-        RetrievePriceJob::dispatchSync('::sku::');
-
-        Bus::assertDispatched(ProcessPriceJob::class);
-    }
-
-    public function test_it_does_not_dispatch_process_job(): void
-    {
-        Bus::fake([ProcessPriceJob::class]);
-
-        config()->set('magento-prices.retrievers.price', DummyPriceRetriever::class);
-
-        $this->mock(DummyPriceRetriever::class, function (MockInterface $mock) {
-            $mock->shouldReceive('retrieve')
-                ->andReturnNull();
-        });
-
-        RetrievePriceJob::dispatchSync('::sku::');
-
-        Bus::assertNotDispatched(ProcessPriceJob::class);
-    }
-
-    public function test_queue_attributes_force_false(): void
-    {
-        $job = new RetrievePriceJob('::sku::', false);
-
-        $this->assertEquals(['::sku::', 'force:false'], $job->tags());
-    }
-
-    public function test_queue_attributes_force_true(): void
-    {
-        $job = new RetrievePriceJob('::sku::', true);
-
-        $this->assertEquals(['::sku::', 'force:true'], $job->tags());
-    }
-}
diff --git a/tests/Jobs/RetrievePricesJobTest.php b/tests/Jobs/RetrievePricesJobTest.php
deleted file mode 100644
index c47faa8..0000000
--- a/tests/Jobs/RetrievePricesJobTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Jobs;
-
-use Illuminate\Support\Facades\Bus;
-use JustBetter\MagentoPrices\Jobs\RetrievePriceJob;
-use JustBetter\MagentoPrices\Jobs\RetrievePricesJob;
-use JustBetter\MagentoPrices\Retriever\DummySkuRetriever;
-use JustBetter\MagentoPrices\Tests\TestCase;
-use Mockery\MockInterface;
-
-class RetrievePricesJobTest extends TestCase
-{
-    public function test_it_dispatches_all_retrieve_job(): void
-    {
-        Bus::fake([RetrievePriceJob::class]);
-
-        config()->set('magento-prices.retrievers.sku', DummySkuRetriever::class);
-
-        $this->mock(DummySkuRetriever::class, function (MockInterface $mock) {
-            $mock->shouldReceive('retrieveAll')
-                ->andReturn(collect(['::sku_1::', '::sku_2::']));
-        });
-
-        RetrievePricesJob::dispatchSync();
-
-        Bus::assertDispatchedTimes(RetrievePriceJob::class, 2);
-    }
-
-    public function test_it_dispatches_date_retrieve_job(): void
-    {
-        Bus::fake([RetrievePriceJob::class]);
-
-        config()->set('magento-prices.retrievers.sku', DummySkuRetriever::class);
-
-        $this->mock(DummySkuRetriever::class, function (MockInterface $mock) {
-            $mock->shouldReceive('retrieveByDate')
-                ->andReturn(collect());
-        });
-
-        RetrievePricesJob::dispatchSync(now());
-
-        Bus::assertDispatchedTimes(RetrievePriceJob::class, 0);
-    }
-
-    public function test_queue_attributes_force_false(): void
-    {
-        $job = new RetrievePricesJob(null, false);
-
-        $this->assertEquals(['force:false', 'all'], $job->tags());
-    }
-
-    public function test_queue_attributes_force_true(): void
-    {
-        $from = now();
-
-        $job = new RetrievePricesJob($from, true);
-
-        $this->assertEquals(['force:true', 'from:'.$from->toDateTimeString()], $job->tags());
-    }
-}
diff --git a/tests/Jobs/SyncMissingPricesJobTest.php b/tests/Jobs/SyncMissingPricesJobTest.php
deleted file mode 100644
index 70e358e..0000000
--- a/tests/Jobs/SyncMissingPricesJobTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Jobs;
-
-use Illuminate\Support\Facades\Bus;
-use JustBetter\MagentoPrices\Contracts\FindsProductsWithMissingPrices;
-use JustBetter\MagentoPrices\Jobs\RetrievePriceJob;
-use JustBetter\MagentoPrices\Jobs\SyncMissingPricesJob;
-use JustBetter\MagentoPrices\Jobs\UpdatePriceJob;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-use JustBetter\MagentoPrices\Tests\TestCase;
-use Mockery\MockInterface;
-
-class SyncMissingPricesJobTest extends TestCase
-{
-    public function test_it_dispatches_jobs(): void
-    {
-        Bus::fake([UpdatePriceJob::class, RetrievePriceJob::class]);
-
-        MagentoPrice::query()
-            ->create(['sku' => '::sku_1::']);
-
-        $this->mock(FindsProductsWithMissingPrices::class, function (MockInterface $mock) {
-            $mock->shouldReceive('retrieve')
-                ->andReturn(collect(['::sku_1::', '::sku_2::']));
-        });
-
-        SyncMissingPricesJob::dispatchSync();
-
-        Bus::assertDispatched(UpdatePriceJob::class, function (UpdatePriceJob $job) {
-            return $job->sku === '::sku_1::';
-        });
-
-        Bus::assertDispatched(RetrievePriceJob::class, function (RetrievePriceJob $job) {
-            return $job->sku === '::sku_2::';
-        });
-    }
-}
diff --git a/tests/Jobs/SyncPricesJobTest.php b/tests/Jobs/SyncPricesJobTest.php
deleted file mode 100644
index 5690aa9..0000000
--- a/tests/Jobs/SyncPricesJobTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Jobs;
-
-use JustBetter\MagentoPrices\Contracts\SyncsPrices;
-use JustBetter\MagentoPrices\Jobs\SyncPricesJob;
-use JustBetter\MagentoPrices\Tests\TestCase;
-use Mockery\MockInterface;
-
-class SyncPricesJobTest extends TestCase
-{
-    public function test_it_calls_action(): void
-    {
-        $this->mock(SyncsPrices::class, function (MockInterface $mock) {
-            $mock->shouldReceive('sync')->once();
-        });
-
-        SyncPricesJob::dispatchSync();
-    }
-}
diff --git a/tests/Jobs/Update/UpdatePriceJobTest.php b/tests/Jobs/Update/UpdatePriceJobTest.php
new file mode 100644
index 0000000..d95199c
--- /dev/null
+++ b/tests/Jobs/Update/UpdatePriceJobTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Jobs\Update;
+
+use JustBetter\MagentoPrices\Contracts\Update\Sync\UpdatesPrice;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePriceJob;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use Mockery\MockInterface;
+use PHPUnit\Framework\Attributes\Test;
+
+class UpdatePriceJobTest extends TestCase
+{
+    #[Test]
+    public function it_calls_action(): void
+    {
+        $this->mock(UpdatesPrice::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('update')->once();
+        });
+
+        /** @var Price $price */
+        $price = Price::query()->create(['sku' => '::sku::']);
+
+        UpdatePriceJob::dispatch($price);
+    }
+
+    #[Test]
+    public function it_has_unique_id(): void
+    {
+        /** @var Price $price */
+        $price = Price::query()->create(['sku' => '::sku::']);
+
+        $job = new UpdatePriceJob($price);
+
+        $this->assertEquals($price->id, $job->uniqueId());
+    }
+
+    #[Test]
+    public function it_has_tags(): void
+    {
+        /** @var Price $price */
+        $price = Price::query()->create(['sku' => '::sku::']);
+
+        $job = new UpdatePriceJob($price);
+
+        $this->assertEquals(['::sku::'], $job->tags());
+    }
+}
diff --git a/tests/Jobs/Update/UpdatePricesAsyncJobTest.php b/tests/Jobs/Update/UpdatePricesAsyncJobTest.php
new file mode 100644
index 0000000..be7b28e
--- /dev/null
+++ b/tests/Jobs/Update/UpdatePricesAsyncJobTest.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Jobs\Update;
+
+use JustBetter\MagentoPrices\Contracts\Update\Async\UpdatesPricesAsync;
+use JustBetter\MagentoPrices\Jobs\Update\UpdatePricesAsyncJob;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use Mockery\MockInterface;
+use PHPUnit\Framework\Attributes\Test;
+
+class UpdatePricesAsyncJobTest extends TestCase
+{
+    #[Test]
+    public function it_calls_action(): void
+    {
+        $this->mock(UpdatesPricesAsync::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('update')->once();
+        });
+
+        UpdatePricesAsyncJob::dispatch(collect());
+    }
+
+    #[Test]
+    public function it_has_tags(): void
+    {
+        $prices = collect([
+            Price::query()->create(['sku' => '::sku_1::']),
+            Price::query()->create(['sku' => '::sku_2::']),
+        ]);
+        $job = new UpdatePricesAsyncJob($prices);
+
+        $this->assertEquals(['::sku_1::', '::sku_2::'], $job->tags());
+    }
+}
diff --git a/tests/Jobs/UpdateMagentoBasePricesJobTest.php b/tests/Jobs/UpdateMagentoBasePricesJobTest.php
deleted file mode 100644
index d595668..0000000
--- a/tests/Jobs/UpdateMagentoBasePricesJobTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Jobs;
-
-use Illuminate\Http\Client\Response;
-use JustBetter\MagentoPrices\Contracts\UpdatesMagentoBasePrice;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Jobs\UpdateMagentoBasePricesJob;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-use JustBetter\MagentoPrices\Tests\TestCase;
-use Mockery\MockInterface;
-
-class UpdateMagentoBasePricesJobTest extends TestCase
-{
-    public function test_it_calls_action(): void
-    {
-        $this->mock(UpdatesMagentoBasePrice::class, function (MockInterface $mock) {
-            $mock->shouldReceive('update')->once();
-        });
-
-        UpdateMagentoBasePricesJob::dispatchSync(new PriceData('::sku::', collect()));
-    }
-
-    public function test_queue_attributes(): void
-    {
-        $job = new UpdateMagentoBasePricesJob(new PriceData('::sku::', collect()));
-
-        $this->assertEquals('::sku::', $job->uniqueId());
-        $this->assertEquals(['::sku::'], $job->tags());
-    }
-
-    public function test_it_handles_failure(): void
-    {
-        $job = new UpdateMagentoBasePricesJob(new PriceData('::sku::', collect()));
-
-        $exception = (new Response(new \GuzzleHttp\Psr7\Response(500)))->toException();
-
-        $job->failed($exception);
-
-        $model = MagentoPrice::findBySku('::sku::');
-
-        $this->assertEquals(1, $model->fail_count);
-        $this->assertNotNull($model->last_failed);
-    }
-}
diff --git a/tests/Jobs/UpdateMagentoSpecialPricesJobTest.php b/tests/Jobs/UpdateMagentoSpecialPricesJobTest.php
deleted file mode 100644
index 95876ea..0000000
--- a/tests/Jobs/UpdateMagentoSpecialPricesJobTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Jobs;
-
-use Illuminate\Http\Client\Response;
-use JustBetter\MagentoPrices\Contracts\UpdatesMagentoSpecialPrice;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Jobs\UpdateMagentoSpecialPricesJob;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-use JustBetter\MagentoPrices\Tests\TestCase;
-use Mockery\MockInterface;
-
-class UpdateMagentoSpecialPricesJobTest extends TestCase
-{
-    public function test_it_calls_action(): void
-    {
-        $this->mock(UpdatesMagentoSpecialPrice::class, function (MockInterface $mock) {
-            $mock->shouldReceive('update')->once();
-        });
-
-        UpdateMagentoSpecialPricesJob::dispatchSync(new PriceData('::sku::', collect()));
-    }
-
-    public function test_queue_attributes(): void
-    {
-        $job = new UpdateMagentoSpecialPricesJob(new PriceData('::sku::', collect()));
-
-        $this->assertEquals('::sku::', $job->uniqueId());
-        $this->assertEquals(['::sku::'], $job->tags());
-    }
-
-    public function test_it_handles_failure(): void
-    {
-        $job = new UpdateMagentoSpecialPricesJob(new PriceData('::sku::', collect()));
-
-        $exception = (new Response(new \GuzzleHttp\Psr7\Response(500)))->toException();
-
-        $job->failed($exception);
-
-        $model = MagentoPrice::findBySku('::sku::');
-
-        $this->assertEquals(1, $model->fail_count);
-        $this->assertNotNull($model->last_failed);
-    }
-}
diff --git a/tests/Jobs/UpdateMagentoTierPricesJobTest.php b/tests/Jobs/UpdateMagentoTierPricesJobTest.php
deleted file mode 100644
index 1ff8656..0000000
--- a/tests/Jobs/UpdateMagentoTierPricesJobTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Jobs;
-
-use Illuminate\Http\Client\Response;
-use JustBetter\MagentoPrices\Contracts\UpdatesMagentoTierPrice;
-use JustBetter\MagentoPrices\Data\PriceData;
-use JustBetter\MagentoPrices\Jobs\UpdateMagentoTierPricesJob;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-use JustBetter\MagentoPrices\Tests\TestCase;
-use Mockery\MockInterface;
-
-class UpdateMagentoTierPricesJobTest extends TestCase
-{
-    public function test_it_calls_action(): void
-    {
-        $this->mock(UpdatesMagentoTierPrice::class, function (MockInterface $mock) {
-            $mock->shouldReceive('update')->once();
-        });
-
-        UpdateMagentoTierPricesJob::dispatchSync(new PriceData('::sku::', collect()));
-    }
-
-    public function test_queue_attributes(): void
-    {
-        $job = new UpdateMagentoTierPricesJob(new PriceData('::sku::', collect()));
-
-        $this->assertEquals('::sku::', $job->uniqueId());
-        $this->assertEquals(['::sku::'], $job->tags());
-    }
-
-    public function test_it_handles_failure(): void
-    {
-        $job = new UpdateMagentoTierPricesJob(new PriceData('::sku::', collect()));
-
-        $exception = (new Response(new \GuzzleHttp\Psr7\Response(500)))->toException();
-
-        $job->failed($exception);
-
-        $model = MagentoPrice::findBySku('::sku::');
-
-        $this->assertEquals(1, $model->fail_count);
-        $this->assertNotNull($model->last_failed);
-    }
-}
diff --git a/tests/Jobs/UpdatePriceJobTest.php b/tests/Jobs/UpdatePriceJobTest.php
deleted file mode 100644
index eda1afd..0000000
--- a/tests/Jobs/UpdatePriceJobTest.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Jobs;
-
-use Illuminate\Bus\PendingBatch;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Bus;
-use Illuminate\Support\Facades\Event;
-use JustBetter\MagentoPrices\Events\UpdatedPriceEvent;
-use JustBetter\MagentoPrices\Jobs\UpdateMagentoBasePricesJob;
-use JustBetter\MagentoPrices\Jobs\UpdateMagentoSpecialPricesJob;
-use JustBetter\MagentoPrices\Jobs\UpdateMagentoTierPricesJob;
-use JustBetter\MagentoPrices\Jobs\UpdatePriceJob;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-use JustBetter\MagentoPrices\Tests\TestCase;
-use JustBetter\MagentoProducts\Contracts\ChecksMagentoExistence;
-use Mockery\MockInterface;
-
-class UpdatePriceJobTest extends TestCase
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        Bus::fake([
-            UpdateMagentoBasePricesJob::class, UpdateMagentoTierPricesJob::class, UpdateMagentoSpecialPricesJob::class,
-        ]);
-
-        Event::fake();
-
-        $this->mock(ChecksMagentoExistence::class, function (MockInterface $mock) {
-            $mock->shouldReceive('exists')
-                ->with('::sku::')
-                ->andReturnTrue();
-        });
-
-        MagentoPrice::query()->create([
-            'sku' => '::sku::',
-            'base_prices' => [['price' => 10, 'storeId' => 0]],
-            'tier_prices' => [['price' => 10, 'storeId' => 0, 'customer_group' => 'ALL GROUPS', 'quantity' => 1]],
-            'special_prices' => [['price' => 10, 'storeId' => 0, 'price_from' => null, 'price_to' => null]],
-        ]);
-    }
-
-    public function test_it_checks_existence(): void
-    {
-        MagentoPrice::query()->create([
-            'sku' => '::sku_2::',
-        ]);
-
-        $this->mock(ChecksMagentoExistence::class, function (MockInterface $mock) {
-            $mock->shouldReceive('exists')
-                ->with('::sku_2::')
-                ->once()
-                ->andReturnFalse();
-        });
-
-        UpdatePriceJob::dispatchSync('::sku_2::');
-
-        $model = MagentoPrice::findBySku('::sku_2::');
-
-        $this->assertFalse($model->update);
-        $this->assertFalse($model->sync);
-    }
-
-    public function test_it_dispatches_update_jobs(): void
-    {
-        UpdatePriceJob::dispatchSync('::sku::');
-
-        Bus::assertBatched(function (PendingBatch $batch): bool {
-            /** @var Collection $jobs */
-            $jobs = $batch->jobs->map(function (mixed $job): string {
-                return get_class($job);
-            });
-
-            if ($jobs->contains('JustBetter\MagentoPrices\Jobs\UpdateMagentoBasePricesJob') && $jobs->contains('JustBetter\MagentoPrices\Jobs\UpdateMagentoTierPricesJob') && $jobs->contains('JustBetter\MagentoPrices\Jobs\UpdateMagentoSpecialPricesJob')) {
-                return true;
-            }
-
-            return false;
-        });
-
-        $model = MagentoPrice::findBySku('::sku::');
-
-        $this->assertFalse($model->update);
-    }
-
-    public function test_it_dispatches_updated_event(): void
-    {
-        UpdatePriceJob::dispatchSync('::sku::');
-
-        Event::assertDispatched(UpdatedPriceEvent::class);
-    }
-
-    /** @dataProvider jobTypes */
-    public function test_it_dispatches_update_jobs_by_type(string $type, string $dispatch, array $notDispatch): void
-    {
-        UpdatePriceJob::dispatchSync('::sku::', $type);
-
-        Bus::assertBatched(function (PendingBatch $batch) use ($dispatch): bool {
-            return $batch->jobs->first() instanceof $dispatch;
-        });
-
-        Bus::assertBatched(function (PendingBatch $batch) use ($notDispatch): bool {
-            foreach ($notDispatch as $notDispatchJobClass) {
-                foreach ($batch->jobs as $job) {
-                    if ($job instanceof $notDispatchJobClass) {
-                        return false;
-                    }
-                }
-            }
-
-            return true;
-        });
-    }
-
-    public static function jobTypes(): array
-    {
-        return [
-            [
-                'type' => 'base',
-                'dispatch' => UpdateMagentoBasePricesJob::class,
-                'notDispatch' => [UpdateMagentoTierPricesJob::class, UpdateMagentoSpecialPricesJob::class],
-            ],
-            [
-                'type' => 'tier',
-                'dispatch' => UpdateMagentoTierPricesJob::class,
-                'notDispatch' => [UpdateMagentoBasePricesJob::class, UpdateMagentoSpecialPricesJob::class],
-            ],
-            [
-                'type' => 'special',
-                'dispatch' => UpdateMagentoSpecialPricesJob::class,
-                'notDispatch' => [UpdateMagentoBasePricesJob::class, UpdateMagentoTierPricesJob::class],
-            ],
-        ];
-    }
-
-    public function test_it_does_not_dispatch_empty_base(): void
-    {
-        MagentoPrice::findBySku('::sku::')
-            ->update(['base_prices' => []]);
-
-        UpdatePriceJob::dispatchSync('::sku::');
-
-        Bus::assertBatched(function (PendingBatch $batch): bool {
-            foreach ($batch->jobs as $job) {
-                if ($job instanceof UpdateMagentoBasePricesJob) {
-                    return false;
-                }
-            }
-
-            return true;
-        });
-    }
-
-    public function test_it_does_not_dispatch_empty_tier(): void
-    {
-        MagentoPrice::findBySku('::sku::')
-            ->update(['tier_prices' => []]);
-
-        UpdatePriceJob::dispatchSync('::sku::');
-
-        Bus::assertBatched(function (PendingBatch $batch): bool {
-            foreach ($batch->jobs as $job) {
-                if ($job instanceof UpdateMagentoTierPricesJob) {
-                    return false;
-                }
-            }
-
-            return true;
-        });
-    }
-
-    public function test_it_does_not_dispatch_empty_special(): void
-    {
-        MagentoPrice::findBySku('::sku::')
-            ->update(['special_prices' => []]);
-
-        UpdatePriceJob::dispatchSync('::sku::');
-
-        Bus::assertBatched(function (PendingBatch $batch): bool {
-            foreach ($batch->jobs as $job) {
-                if ($job instanceof UpdateMagentoSpecialPricesJob) {
-                    return false;
-                }
-            }
-
-            return true;
-        });
-    }
-
-    public function test_it_does_dispatch_empty_tier_to_remove_tier_prices(): void
-    {
-        MagentoPrice::findBySku('::sku::')
-            ->update(['tier_prices' => [], 'has_tier' => true]);
-
-        UpdatePriceJob::dispatchSync('::sku::');
-
-        Bus::assertBatched(function (PendingBatch $batch): bool {
-            foreach ($batch->jobs as $job) {
-                if ($job instanceof UpdateMagentoTierPricesJob) {
-                    return true;
-                }
-            }
-
-            return false;
-        });
-
-        $model = MagentoPrice::findBySku('::sku::');
-        $this->assertFalse($model->has_tier);
-    }
-
-    public function test_it_does_dispatch_empty_special_to_remove_special_prices(): void
-    {
-        MagentoPrice::findBySku('::sku::')
-            ->update(['special_prices' => [], 'has_special' => true]);
-
-        UpdatePriceJob::dispatchSync('::sku::');
-
-        Bus::assertBatched(function (PendingBatch $batch): bool {
-            foreach ($batch->jobs as $job) {
-                if ($job instanceof UpdateMagentoSpecialPricesJob) {
-                    return true;
-                }
-            }
-
-            return false;
-        });
-
-        $model = MagentoPrice::findBySku('::sku::');
-        $this->assertFalse($model->has_special);
-    }
-
-    public function test_queue_attributes(): void
-    {
-        $job = new UpdatePriceJob('::sku::');
-
-        $this->assertEquals('::sku::', $job->uniqueId());
-        $this->assertEquals(['::sku::', 'type:all'], $job->tags());
-
-        $job = new UpdatePriceJob('::sku::', 'base');
-        $this->assertEquals(['::sku::', 'type:base'], $job->tags());
-    }
-
-    public function test_it_does_nothing(): void
-    {
-        $this->mock(ChecksMagentoExistence::class, function (MockInterface $mock) {
-            $mock->shouldNotReceive('exists');
-        });
-
-        UpdatePriceJob::dispatch('::non_existent::');
-    }
-
-    public function test_it_clears_failure_data_if_success(): void
-    {
-        MagentoPrice::findBySku('::sku::')
-            ->update([
-                'fail_count' => 5,
-                'last_failed' => now(),
-            ]);
-
-        UpdatePriceJob::dispatchSync('::sku::');
-
-        Bus::assertBatched(function (PendingBatch $batch) {
-            /* @var \Illuminate\Queue\SerializableClosure $thenCallback */
-            [$thenCallback] = $batch->thenCallbacks();
-
-            $thenCallback->getClosure()->call($this);
-
-            $model = MagentoPrice::findBySku('::sku::');
-
-            $this->assertEquals(0, $model->fail_count);
-            $this->assertNull($model->last_failed);
-
-            return true;
-        });
-    }
-}
diff --git a/tests/Jobs/Utility/ImportCustomerGroupsJobTest.php b/tests/Jobs/Utility/ImportCustomerGroupsJobTest.php
new file mode 100644
index 0000000..0594f19
--- /dev/null
+++ b/tests/Jobs/Utility/ImportCustomerGroupsJobTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Jobs\Utility;
+
+use JustBetter\MagentoPrices\Contracts\Utility\ImportsCustomerGroups;
+use JustBetter\MagentoPrices\Jobs\Utility\ImportCustomerGroupsJob;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use Mockery\MockInterface;
+use PHPUnit\Framework\Attributes\Test;
+
+class ImportCustomerGroupsJobTest extends TestCase
+{
+    #[Test]
+    public function it_calls_action(): void
+    {
+        $this->mock(ImportsCustomerGroups::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('import')->once();
+        });
+
+        ImportCustomerGroupsJob::dispatch();
+    }
+}
diff --git a/tests/Jobs/Utility/ProcessProductsWithMissingPricesJobTest.php b/tests/Jobs/Utility/ProcessProductsWithMissingPricesJobTest.php
new file mode 100644
index 0000000..d6466c2
--- /dev/null
+++ b/tests/Jobs/Utility/ProcessProductsWithMissingPricesJobTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Jobs\Utility;
+
+use JustBetter\MagentoPrices\Contracts\Utility\ProcessesProductsWithMissingPrices;
+use JustBetter\MagentoPrices\Jobs\Utility\ProcessProductsWithMissingPricesJob;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use Mockery\MockInterface;
+use PHPUnit\Framework\Attributes\Test;
+
+class ProcessProductsWithMissingPricesJobTest extends TestCase
+{
+    #[Test]
+    public function it_calls_action(): void
+    {
+        $this->mock(ProcessesProductsWithMissingPrices::class, function (MockInterface $mock): void {
+            $mock->shouldReceive('process')->once();
+        });
+
+        ProcessProductsWithMissingPricesJob::dispatch();
+    }
+}
diff --git a/tests/Listeners/BulkOperationStatusListenerTest.php b/tests/Listeners/BulkOperationStatusListenerTest.php
new file mode 100644
index 0000000..71573af
--- /dev/null
+++ b/tests/Listeners/BulkOperationStatusListenerTest.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Listeners;
+
+use Illuminate\Support\Facades\Event;
+use JustBetter\MagentoAsync\Enums\OperationStatus;
+use JustBetter\MagentoAsync\Models\BulkOperation;
+use JustBetter\MagentoAsync\Models\BulkRequest;
+use JustBetter\MagentoPrices\Events\UpdatedPriceEvent;
+use JustBetter\MagentoPrices\Listeners\BulkOperationStatusListener;
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class BulkOperationStatusListenerTest extends TestCase
+{
+    #[Test]
+    public function it_handles_complete_status(): void
+    {
+        Event::fake();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => 'sku',
+        ]);
+
+        /** @var BulkRequest $request */
+        $request = BulkRequest::query()->create([
+            'magento_connection' => 'default',
+            'store_code' => 'store',
+            'path' => 'products',
+            'bulk_uuid' => '::uuid::',
+            'request' => [],
+            'response' => [],
+        ]);
+
+        /** @var BulkOperation $operation */
+        $operation = $request->operations()->create([
+            'subject_type' => get_class($model),
+            'subject_id' => $model->getKey(),
+            'operation_id' => 0,
+            'status' => OperationStatus::Complete,
+        ]);
+
+        /** @var BulkOperationStatusListener $listener */
+        $listener = app(BulkOperationStatusListener::class);
+
+        $listener->execute($operation);
+
+        Event::assertDispatched(UpdatedPriceEvent::class);
+        $this->assertNotNull($model->refresh()->last_updated);
+    }
+
+    #[Test]
+    public function it_handles_failed_status(): void
+    {
+        Event::fake();
+
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => 'sku',
+        ]);
+
+        /** @var BulkRequest $request */
+        $request = BulkRequest::query()->create([
+            'magento_connection' => 'default',
+            'store_code' => 'store',
+            'path' => 'products',
+            'bulk_uuid' => '::uuid::',
+            'request' => [],
+            'response' => [],
+        ]);
+
+        /** @var BulkOperation $operation */
+        $operation = $request->operations()->create([
+            'subject_type' => get_class($model),
+            'subject_id' => $model->getKey(),
+            'operation_id' => 0,
+            'status' => OperationStatus::NotRetriablyFailed,
+        ]);
+
+        /** @var BulkOperationStatusListener $listener */
+        $listener = app(BulkOperationStatusListener::class);
+
+        $listener->execute($operation);
+
+        Event::assertNotDispatched(UpdatedPriceEvent::class);
+        $this->assertNull($model->refresh()->last_updated);
+    }
+}
diff --git a/tests/Mocks/CheckMagentoExistenceMock.php b/tests/Mocks/CheckMagentoExistenceMock.php
deleted file mode 100644
index ee810c7..0000000
--- a/tests/Mocks/CheckMagentoExistenceMock.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Mocks;
-
-use JustBetter\MagentoProducts\Contracts\ChecksMagentoExistence;
-
-class CheckMagentoExistenceMock implements ChecksMagentoExistence
-{
-    public function exists(string $sku): bool
-    {
-        return true;
-    }
-}
diff --git a/tests/Models/MagentoPriceTest.php b/tests/Models/MagentoPriceTest.php
deleted file mode 100644
index ab52693..0000000
--- a/tests/Models/MagentoPriceTest.php
+++ /dev/null
@@ -1,332 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Models;
-
-use Carbon\Carbon;
-use JustBetter\MagentoPrices\Data\BasePriceData;
-use JustBetter\MagentoPrices\Data\SpecialPriceData;
-use JustBetter\MagentoPrices\Data\TierPriceData;
-use JustBetter\MagentoPrices\Models\MagentoPrice;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class MagentoPriceTest extends TestCase
-{
-    /** @dataProvider specialPriceProvider */
-    public function test_special_price_changed(array $original, array $updated, bool $expectChanged): void
-    {
-        Carbon::setTestNow(Carbon::createFromDate(2022, 06, 24));
-
-        $model = new MagentoPrice();
-
-        $model->setAttribute('special_prices', $original);
-
-        $model->syncOriginal();
-
-        $model->setAttribute('special_prices', $updated);
-
-        $this->assertEquals($expectChanged, $model->specialPriceChanged());
-    }
-
-    public static function specialPriceProvider(): array
-    {
-        return [
-            'No change' => [
-                'original' => [
-                    [
-                        'price' => '25.0000',
-                        'storeId' => 1,
-                        'price_to' => '2023-06-23 00:00:00',
-                        'price_from' => '2022-06-23 00:00:00',
-                    ],
-                ],
-                'updated' => [
-                    [
-                        'price' => '25.0000',
-                        'storeId' => 1,
-                        'price_to' => '2023-06-23 00:00:00',
-                        'price_from' => '2022-06-23 00:00:00',
-                    ],
-                ],
-                'expected_change' => false,
-            ],
-
-            'Store id changed' => [
-                'original' => [
-                    [
-                        'price' => '25.0000',
-                        'storeId' => 1,
-                        'price_to' => '2023-06-23 00:00:00',
-                        'price_from' => '2022-06-23 00:00:00',
-                    ],
-                ],
-                'updated' => [
-                    [
-                        'price' => '25.0000',
-                        'storeId' => 0,
-                        'price_to' => '2023-06-23 00:00:00',
-                        'price_from' => '2022-06-23 00:00:00',
-                    ],
-                ],
-                'expected_change' => true,
-            ],
-
-            'Price changed' => [
-                'original' => [
-                    [
-                        'price' => '25.0000',
-                        'storeId' => 1,
-                        'price_to' => '2023-06-23 00:00:00',
-                        'price_from' => '2022-06-23 00:00:00',
-                    ],
-                ],
-                'updated' => [
-                    [
-                        'price' => '26.0000',
-                        'storeId' => 1,
-                        'price_to' => '2023-06-23 00:00:00',
-                        'price_from' => '2022-06-23 00:00:00',
-                    ],
-                ],
-                'expected_change' => true,
-            ],
-
-            'Date updated 1 day' => [
-                'original' => [
-                    [
-                        'price' => '25.0000',
-                        'storeId' => 1,
-                        'price_to' => '2023-06-23 00:00:00',
-                        'price_from' => '2022-06-23 00:00:00',
-                    ],
-                ],
-                'updated' => [
-                    [
-                        'price' => '25.0000',
-                        'storeId' => 1,
-                        'price_to' => '2023-06-24 00:00:00',
-                        'price_from' => '2022-06-24 00:00:00',
-                    ],
-                ],
-                'expected_change' => false,
-            ],
-
-            'Date expired' => [
-                'original' => [
-                    [
-                        'price' => '25.0000',
-                        'storeId' => 1,
-                        'price_to' => '2022-06-23 00:00:00',
-                        'price_from' => '2021-06-23 00:00:00',
-                    ],
-                ],
-                'updated' => [
-                    [
-                        'price' => '25.0000',
-                        'storeId' => 1,
-                        'price_to' => '2023-06-24 00:00:00',
-                        'price_from' => '2022-06-24 00:00:00',
-                    ],
-                ],
-                'expected_change' => true,
-            ],
-
-            'Original empty' => [
-                'original' => [],
-                'updated' => [
-                    [
-                        'price' => '25.0000',
-                        'storeId' => 1,
-                        'price_to' => '2023-06-24 00:00:00',
-                        'price_from' => '2022-06-24 00:00:00',
-                    ],
-                ],
-                'expected_change' => true,
-            ],
-
-            'Updated empty' => [
-                'original' => [
-                    [
-                        'price' => '25.0000',
-                        'storeId' => 1,
-                        'price_to' => '2023-06-24 00:00:00',
-                        'price_from' => '2022-06-24 00:00:00',
-                    ],
-                ],
-                'updated' => [],
-                'expected_change' => true,
-            ],
-
-            'Multiple one changed' => [
-                'original' => [
-                    [
-                        'price' => '25.0000',
-                        'storeId' => 1,
-                        'price_to' => '2023-06-24 00:00:00',
-                        'price_from' => '2022-06-24 00:00:00',
-                    ],
-                    [
-                        'price' => '26.0000',
-                        'storeId' => 2,
-                        'price_to' => '2023-06-24 00:00:00',
-                        'price_from' => '2022-06-24 00:00:00',
-                    ],
-                ],
-                'updated' => [
-                    [
-                        'price' => '25.0000',
-                        'storeId' => 1,
-                        'price_to' => '2023-06-24 00:00:00',
-                        'price_from' => '2022-06-24 00:00:00',
-                    ],
-                    [
-                        'price' => '24.0000',
-                        'storeId' => 2,
-                        'price_to' => '2023-06-24 00:00:00',
-                        'price_from' => '2022-06-24 00:00:00',
-                    ],
-                ],
-                'expected_change' => true,
-            ],
-        ];
-    }
-
-    public function test_it_gets_base_prices(): void
-    {
-        MagentoPrice::query()->create([
-            'sku' => '::sku::',
-            'base_prices' => [['price' => 10, 'storeId' => 1]],
-        ]);
-
-        $model = MagentoPrice::findBySku('::sku::');
-
-        $basePrices = $model->base_prices;
-        /** @var BasePriceData $basePrice */
-        $basePrice = $basePrices->first();
-
-        $this->assertCount(1, $basePrices);
-        $this->assertEquals(1, $basePrice->storeId);
-        $this->assertEquals(10, $basePrice->price->getAmount()->toInt());
-    }
-
-    public function test_it_gets_tier_prices(): void
-    {
-        MagentoPrice::query()->create([
-            'sku' => '::sku::',
-            'tier_prices' => [['price' => 10, 'storeId' => 1, 'customer_group' => 'ALL GROUPS', 'quantity' => 1]],
-        ]);
-
-        $model = MagentoPrice::findBySku('::sku::');
-
-        $tierPrices = $model->tier_prices;
-        /** @var TierPriceData $tierPrice */
-        $tierPrice = $tierPrices->first();
-
-        $this->assertCount(1, $tierPrices);
-        $this->assertEquals(1, $tierPrice->storeId);
-        $this->assertEquals(1, $tierPrice->quantity);
-        $this->assertEquals('ALL GROUPS', $tierPrice->groupId);
-        $this->assertEquals(10, $tierPrice->price->getAmount()->toInt());
-    }
-
-    public function test_it_gets_special_prices(): void
-    {
-        MagentoPrice::query()->create([
-            'sku' => '::sku::',
-            'special_prices' => [['price' => 10, 'storeId' => 1, 'price_from' => null, 'price_to' => null]],
-        ]);
-
-        $model = MagentoPrice::findBySku('::sku::');
-
-        $specialPrices = $model->special_prices;
-        /** @var SpecialPriceData $specialPrice */
-        $specialPrice = $specialPrices->first();
-
-        $this->assertCount(1, $specialPrices);
-        $this->assertEquals(1, $specialPrice->storeId);
-        $this->assertEquals(10, $specialPrice->price->getAmount()->toInt());
-    }
-
-    public function test_it_gets_single_base_price(): void
-    {
-        MagentoPrice::query()->create([
-            'sku' => '::sku::',
-            'base_prices' => ['price' => 10, 'storeId' => 1],
-        ]);
-
-        $model = MagentoPrice::findBySku('::sku::');
-
-        $basePrices = $model->base_prices;
-        /** @var BasePriceData $basePrice */
-        $basePrice = $basePrices->first();
-
-        $this->assertCount(1, $basePrices);
-        $this->assertEquals(1, $basePrice->storeId);
-        $this->assertEquals(10, $basePrice->price->getAmount()->toInt());
-    }
-
-    public function test_it_gets_single_tier_price(): void
-    {
-        MagentoPrice::query()->create([
-            'sku' => '::sku::',
-            'tier_prices' => ['price' => 10, 'storeId' => 1, 'customer_group' => 'ALL GROUPS', 'quantity' => 1],
-        ]);
-
-        $model = MagentoPrice::findBySku('::sku::');
-
-        $tierPrices = $model->tier_prices;
-        /** @var TierPriceData $tierPrice */
-        $tierPrice = $tierPrices->first();
-
-        $this->assertCount(1, $tierPrices);
-        $this->assertEquals(1, $tierPrice->storeId);
-        $this->assertEquals(1, $tierPrice->quantity);
-        $this->assertEquals('ALL GROUPS', $tierPrice->groupId);
-        $this->assertEquals(10, $tierPrice->price->getAmount()->toInt());
-    }
-
-    public function test_it_gets_single_special_price(): void
-    {
-        MagentoPrice::query()->create([
-            'sku' => '::sku::',
-            'special_prices' => ['price' => 10, 'storeId' => 1, 'price_from' => null, 'price_to' => null],
-        ]);
-
-        $model = MagentoPrice::findBySku('::sku::');
-
-        $specialPrices = $model->special_prices;
-        /** @var SpecialPriceData $specialPrice */
-        $specialPrice = $specialPrices->first();
-
-        $this->assertCount(1, $specialPrices);
-        $this->assertEquals(1, $specialPrice->storeId);
-        $this->assertEquals(10, $specialPrice->price->getAmount()->toInt());
-    }
-
-    public function test_it_fails_when_registering_too_much_errors(): void
-    {
-        config()->set('magento-prices.fail_count', 3);
-        MagentoPrice::query()->create([
-            'sku' => '::sku::',
-            'fail_count' => 3,
-        ]);
-
-        $model = MagentoPrice::findBySku('::sku::');
-        $model->registerError();
-
-        $this->assertFalse($model->update);
-        $this->assertFalse($model->retrieve);
-        $this->assertEquals(0, $model->fail_count);
-    }
-
-    public function test_it_has_activity(): void
-    {
-        /** @var MagentoPrice $price */
-        $price = MagentoPrice::query()->create([
-            'sku' => '::sku::',
-            'fail_count' => 3,
-        ]);
-
-        $binds = $price->activity()->getBindings();
-        $this->assertEquals([MagentoPrice::class, $price->id], $binds);
-    }
-}
diff --git a/tests/Models/PriceModelTest.php b/tests/Models/PriceModelTest.php
new file mode 100644
index 0000000..81ded77
--- /dev/null
+++ b/tests/Models/PriceModelTest.php
@@ -0,0 +1,89 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Models;
+
+use JustBetter\MagentoPrices\Models\Price;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use PHPUnit\Framework\Attributes\Test;
+
+class PriceModelTest extends TestCase
+{
+    #[Test]
+    public function it_can_register_failures(): void
+    {
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'update' => true,
+        ]);
+
+        $model->registerFailure();
+
+        $this->assertNotNull($model->last_failed);
+        $this->assertEquals(1, $model->fail_count);
+        $this->assertTrue($model->update);
+    }
+
+    #[Test]
+    public function it_will_set_retrieve_update_too_many_failures(): void
+    {
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'fail_count' => 100,
+            'retrieve' => true,
+            'update' => true,
+        ]);
+
+        $model->registerFailure();
+
+        $this->assertEquals(0, $model->fail_count);
+        $this->assertFalse($model->retrieve);
+        $this->assertFalse($model->update);
+    }
+
+    #[Test]
+    public function it_resets_double_state_update(): void
+    {
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'retrieve' => false,
+            'update' => false,
+        ]);
+
+        $model->retrieve = true;
+        $model->update = true;
+
+        $model->save();
+
+        $this->assertTrue($model->retrieve);
+        $this->assertFalse($model->update);
+    }
+
+    #[Test]
+    public function it_resets_double_state_retrieve(): void
+    {
+        /** @var Price $model */
+        $model = Price::query()->create([
+            'sku' => '::sku::',
+            'retrieve' => false,
+            'update' => false,
+        ]);
+
+        $model->retrieve = true;
+        $model->update = true;
+
+        $model->save();
+
+        $this->assertTrue($model->retrieve);
+        $this->assertFalse($model->update);
+
+        $model->update = true;
+
+        $model->save();
+
+        $this->assertFalse($model->retrieve);
+        $this->assertTrue($model->update);
+    }
+}
diff --git a/tests/Repository/RepositoryTest.php b/tests/Repository/RepositoryTest.php
new file mode 100644
index 0000000..a0f085f
--- /dev/null
+++ b/tests/Repository/RepositoryTest.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace JustBetter\MagentoPrices\Tests\Repository;
+
+use JustBetter\MagentoPrices\Exceptions\NotImplementedException;
+use JustBetter\MagentoPrices\Repository\BaseRepository;
+use JustBetter\MagentoPrices\Repository\Repository;
+use JustBetter\MagentoPrices\Tests\Fakes\FakeRepository;
+use JustBetter\MagentoPrices\Tests\TestCase;
+use JustBetter\MagentoProducts\Models\MagentoProduct;
+use PHPUnit\Framework\Attributes\Test;
+
+class RepositoryTest extends TestCase
+{
+    #[Test]
+    public function getters(): void
+    {
+        /** @var Repository $repository */
+        $repository = app(Repository::class);
+
+        $this->assertEquals(250, $repository->retrieveLimit());
+        $this->assertEquals(250, $repository->updateLimit());
+        $this->assertEquals(3, $repository->failLimit());
+    }
+
+    #[Test]
+    public function it_resolves_repository(): void
+    {
+        config()->set('magento-prices.repository', FakeRepository::class);
+
+        $resolved = BaseRepository::resolve();
+
+        $this->assertInstanceOf(FakeRepository::class, $resolved);
+    }
+
+    #[Test]
+    public function it_throws_exception(): void
+    {
+        $repository = BaseRepository::resolve();
+
+        $this->expectException(NotImplementedException::class);
+
+        $repository->retrieve('::sku::');
+    }
+
+    #[Test]
+    public function it_retrieve_magento_skus(): void
+    {
+        MagentoProduct::query()->create(['sku' => '::sku_1::', 'exists_in_magento' => true]);
+        MagentoProduct::query()->create(['sku' => '::sku_2::', 'exists_in_magento' => false]);
+        MagentoProduct::query()->create(['sku' => '::sku_3::', 'exists_in_magento' => true]);
+
+        $repository = BaseRepository::resolve();
+
+        $this->assertEquals(['::sku_1::', '::sku_3::'], $repository->skus()->toArray());
+    }
+}
diff --git a/tests/Retriever/DummyRetrieversTest.php b/tests/Retriever/DummyRetrieversTest.php
deleted file mode 100644
index c56040e..0000000
--- a/tests/Retriever/DummyRetrieversTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Retriever;
-
-use JustBetter\MagentoPrices\Retriever\DummyPriceRetriever;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class DummyRetrieversTest extends TestCase
-{
-    public function test_dummy_sku_retriever(): void
-    {
-        $retriever = new \JustBetter\MagentoPrices\Retriever\DummySkuRetriever();
-
-        $this->assertEquals(['123', '456'], $retriever->retrieveAll()->toArray());
-        $this->assertEquals(['789'], $retriever->retrieveByDate(now())->toArray());
-    }
-
-    public function test_dummy_price_retriever(): void
-    {
-        $retriever = new DummyPriceRetriever();
-
-        $price = $retriever->retrieve('::sku::');
-
-        $this->assertEquals('::sku::', $price->sku);
-        $this->assertCount(1, $price->basePrices);
-        $this->assertCount(0, $price->tierPrices);
-        $this->assertCount(0, $price->specialPrices);
-    }
-}
diff --git a/tests/Retriever/SkuRetrieverTest.php b/tests/Retriever/SkuRetrieverTest.php
deleted file mode 100644
index 6486458..0000000
--- a/tests/Retriever/SkuRetrieverTest.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace JustBetter\MagentoPrices\Tests\Retriever;
-
-use Illuminate\Support\Enumerable;
-use JustBetter\MagentoPrices\Retriever\SkuRetriever;
-use JustBetter\MagentoPrices\Tests\TestCase;
-
-class DummySkuRetriever extends SkuRetriever
-{
-    public function retrieveAll(): Enumerable
-    {
-        return collect();
-    }
-}
-
-class SkuRetrieverTest extends TestCase
-{
-    public function test_it_retrieves_by_date(): void
-    {
-        $dummy = new DummySkuRetriever();
-        $this->assertCount(0, $dummy->retrieveByDate(now()));
-    }
-}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 689bdf1..9e9ee87 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -3,9 +3,8 @@
 namespace JustBetter\MagentoPrices\Tests;
 
 use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
+use Illuminate\Support\Facades\Http;
 use JustBetter\MagentoClient\Client\Magento;
-use JustBetter\MagentoPrices\Retriever\DummyPriceRetriever;
-use JustBetter\MagentoPrices\Retriever\DummySkuRetriever;
 use JustBetter\MagentoPrices\ServiceProvider;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 use Spatie\Activitylog\ActivitylogServiceProvider;
@@ -16,16 +15,9 @@ abstract class TestCase extends BaseTestCase
 
     protected function defineEnvironment($app): void
     {
-        config()->set('magento.base_url', '');
-        config()->set('magento.access_token', '::token::');
-        config()->set('magento.timeout', 30);
-        config()->set('magento.connect_timeout', 30);
-
-        config()->set('magento.currency', 'EUR');
-        config()->set('magento.precision', 2);
+        Magento::fake();
 
-        config()->set('magento-prices.retrievers.sku', DummySkuRetriever::class);
-        config()->set('magento-prices.retrievers.price', DummyPriceRetriever::class);
+        Http::preventStrayRequests();
 
         config()->set('database.default', 'testbench');
         config()->set('database.connections.testbench', [
@@ -35,8 +27,6 @@ protected function defineEnvironment($app): void
         ]);
 
         activity()->disableLogging();
-
-        Magento::fake();
     }
 
     protected function getPackageProviders($app): array
@@ -44,6 +34,8 @@ protected function getPackageProviders($app): array
         return [
             ServiceProvider::class,
             \JustBetter\MagentoClient\ServiceProvider::class,
+            \JustBetter\MagentoProducts\ServiceProvider::class,
+            \JustBetter\MagentoAsync\ServiceProvider::class,
             ActivitylogServiceProvider::class,
         ];
     }