diff --git a/test/Core.Test/Models/Business/SeatSubscriptionUpdateTests.cs b/test/Core.Test/Models/Business/SeatSubscriptionUpdateTests.cs
new file mode 100644
index 0000000000..5cf4b8fbf6
--- /dev/null
+++ b/test/Core.Test/Models/Business/SeatSubscriptionUpdateTests.cs
@@ -0,0 +1,99 @@
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Enums;
+using Bit.Core.Models.Business;
+using Bit.Core.Utilities;
+using Bit.Test.Common.AutoFixture.Attributes;
+using Stripe;
+using Xunit;
+
+namespace Bit.Core.Test.Models.Business;
+
+public class SeatSubscriptionUpdateTests
+{
+    [Theory]
+    [BitAutoData(PlanType.EnterpriseMonthly2019)]
+    [BitAutoData(PlanType.EnterpriseMonthly2020)]
+    [BitAutoData(PlanType.EnterpriseMonthly)]
+    [BitAutoData(PlanType.EnterpriseAnnually2019)]
+    [BitAutoData(PlanType.EnterpriseAnnually2020)]
+    [BitAutoData(PlanType.EnterpriseAnnually)]
+    [BitAutoData(PlanType.TeamsMonthly2019)]
+    [BitAutoData(PlanType.TeamsMonthly2020)]
+    [BitAutoData(PlanType.TeamsMonthly)]
+    [BitAutoData(PlanType.TeamsAnnually2019)]
+    [BitAutoData(PlanType.TeamsAnnually2020)]
+    [BitAutoData(PlanType.TeamsAnnually)]
+    [BitAutoData(PlanType.TeamsStarter)]
+
+    public void UpgradeItemsOptions_ReturnsCorrectOptions(PlanType planType, Organization organization)
+    {
+        var plan = StaticStore.GetPlan(planType);
+        organization.PlanType = planType;
+        var subscription = new Subscription
+        {
+            Items = new StripeList<SubscriptionItem>
+            {
+                Data = new List<SubscriptionItem>
+                {
+                    new ()
+                    {
+                        Id = "subscription_item",
+                        Price = new Price { Id = plan.PasswordManager.StripeSeatPlanId },
+                        Quantity = 1
+                    }
+                }
+            }
+        };
+        var update = new SeatSubscriptionUpdate(organization, plan, 100);
+
+        var options = update.UpgradeItemsOptions(subscription);
+
+        Assert.Single(options);
+        Assert.Equal(plan.PasswordManager.StripeSeatPlanId, options[0].Plan);
+        Assert.Equal(100, options[0].Quantity);
+        Assert.Null(options[0].Deleted);
+    }
+
+    [Theory]
+    [BitAutoData(PlanType.EnterpriseMonthly2019)]
+    [BitAutoData(PlanType.EnterpriseMonthly2020)]
+    [BitAutoData(PlanType.EnterpriseMonthly)]
+    [BitAutoData(PlanType.EnterpriseAnnually2019)]
+    [BitAutoData(PlanType.EnterpriseAnnually2020)]
+    [BitAutoData(PlanType.EnterpriseAnnually)]
+    [BitAutoData(PlanType.TeamsMonthly2019)]
+    [BitAutoData(PlanType.TeamsMonthly2020)]
+    [BitAutoData(PlanType.TeamsMonthly)]
+    [BitAutoData(PlanType.TeamsAnnually2019)]
+    [BitAutoData(PlanType.TeamsAnnually2020)]
+    [BitAutoData(PlanType.TeamsAnnually)]
+    public void RevertItemsOptions_ReturnsCorrectOptions(PlanType planType, Organization organization)
+    {
+        var plan = StaticStore.GetPlan(planType);
+        organization.PlanType = planType;
+        var subscription = new Subscription
+        {
+            Items = new StripeList<SubscriptionItem>
+            {
+                Data = new List<SubscriptionItem>
+                {
+                    new ()
+                    {
+                        Id = "subscription_item",
+                        Price = new Price { Id = plan.PasswordManager.StripeSeatPlanId },
+                        Quantity = 100
+                    }
+                }
+            }
+        };
+        var update = new SeatSubscriptionUpdate(organization, plan, 100);
+        update.UpgradeItemsOptions(subscription);
+
+        var options = update.RevertItemsOptions(subscription);
+
+        Assert.Single(options);
+        Assert.Equal(plan.PasswordManager.StripeSeatPlanId, options[0].Plan);
+        Assert.Equal(organization.Seats, options[0].Quantity);
+        Assert.Null(options[0].Deleted);
+    }
+}
diff --git a/test/Core.Test/Models/Business/ServiceAccountSubscriptionUpdateTests.cs b/test/Core.Test/Models/Business/ServiceAccountSubscriptionUpdateTests.cs
new file mode 100644
index 0000000000..259a53bda0
--- /dev/null
+++ b/test/Core.Test/Models/Business/ServiceAccountSubscriptionUpdateTests.cs
@@ -0,0 +1,100 @@
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Enums;
+using Bit.Core.Models.Business;
+using Bit.Core.Utilities;
+using Bit.Test.Common.AutoFixture.Attributes;
+using Stripe;
+using Xunit;
+
+namespace Bit.Core.Test.Models.Business;
+
+public class ServiceAccountSubscriptionUpdateTests
+{
+    [Theory]
+    [BitAutoData(PlanType.EnterpriseMonthly2019)]
+    [BitAutoData(PlanType.EnterpriseMonthly2020)]
+    [BitAutoData(PlanType.EnterpriseMonthly)]
+    [BitAutoData(PlanType.EnterpriseAnnually2019)]
+    [BitAutoData(PlanType.EnterpriseAnnually2020)]
+    [BitAutoData(PlanType.EnterpriseAnnually)]
+    [BitAutoData(PlanType.TeamsMonthly2019)]
+    [BitAutoData(PlanType.TeamsMonthly2020)]
+    [BitAutoData(PlanType.TeamsMonthly)]
+    [BitAutoData(PlanType.TeamsAnnually2019)]
+    [BitAutoData(PlanType.TeamsAnnually2020)]
+    [BitAutoData(PlanType.TeamsAnnually)]
+    [BitAutoData(PlanType.TeamsStarter)]
+
+    public void UpgradeItemsOptions_ReturnsCorrectOptions(PlanType planType, Organization organization)
+    {
+        var plan = StaticStore.GetPlan(planType);
+        organization.PlanType = planType;
+        var subscription = new Subscription
+        {
+            Items = new StripeList<SubscriptionItem>
+            {
+                Data = new List<SubscriptionItem>
+                {
+                    new ()
+                    {
+                        Id = "subscription_item",
+                        Price = new Price { Id = plan.SecretsManager.StripeServiceAccountPlanId },
+                        Quantity = 1
+                    }
+                }
+            }
+        };
+        var update = new ServiceAccountSubscriptionUpdate(organization, plan, 3);
+
+        var options = update.UpgradeItemsOptions(subscription);
+
+        Assert.Single(options);
+        Assert.Equal(plan.SecretsManager.StripeServiceAccountPlanId, options[0].Plan);
+        Assert.Equal(3, options[0].Quantity);
+        Assert.Null(options[0].Deleted);
+    }
+
+    [Theory]
+    [BitAutoData(PlanType.EnterpriseMonthly2019)]
+    [BitAutoData(PlanType.EnterpriseMonthly2020)]
+    [BitAutoData(PlanType.EnterpriseMonthly)]
+    [BitAutoData(PlanType.EnterpriseAnnually2019)]
+    [BitAutoData(PlanType.EnterpriseAnnually2020)]
+    [BitAutoData(PlanType.EnterpriseAnnually)]
+    [BitAutoData(PlanType.TeamsMonthly2019)]
+    [BitAutoData(PlanType.TeamsMonthly2020)]
+    [BitAutoData(PlanType.TeamsMonthly)]
+    [BitAutoData(PlanType.TeamsAnnually2019)]
+    [BitAutoData(PlanType.TeamsAnnually2020)]
+    [BitAutoData(PlanType.TeamsAnnually)]
+    public void RevertItemsOptions_ReturnsCorrectOptions(PlanType planType, Organization organization)
+    {
+        var plan = StaticStore.GetPlan(planType);
+        organization.PlanType = planType;
+        var quantity = 5;
+        var subscription = new Subscription
+        {
+            Items = new StripeList<SubscriptionItem>
+            {
+                Data = new List<SubscriptionItem>
+                {
+                    new ()
+                    {
+                        Id = "subscription_item",
+                        Price = new Price { Id = plan.SecretsManager.StripeServiceAccountPlanId },
+                        Quantity = quantity
+                    }
+                }
+            }
+        };
+        var update = new ServiceAccountSubscriptionUpdate(organization, plan, quantity);
+        update.UpgradeItemsOptions(subscription);
+
+        var options = update.RevertItemsOptions(subscription);
+
+        Assert.Single(options);
+        Assert.Equal(plan.SecretsManager.StripeServiceAccountPlanId, options[0].Plan);
+        Assert.Equal(quantity, options[0].Quantity);
+        Assert.Null(options[0].Deleted);
+    }
+}
diff --git a/test/Core.Test/Models/Business/SmSeatSubscriptionUpdateTests.cs b/test/Core.Test/Models/Business/SmSeatSubscriptionUpdateTests.cs
new file mode 100644
index 0000000000..f7ce31167e
--- /dev/null
+++ b/test/Core.Test/Models/Business/SmSeatSubscriptionUpdateTests.cs
@@ -0,0 +1,101 @@
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.Enums;
+using Bit.Core.Models.Business;
+using Bit.Core.Utilities;
+using Bit.Test.Common.AutoFixture.Attributes;
+using Stripe;
+using Xunit;
+
+namespace Bit.Core.Test.Models.Business;
+
+public class SmSeatSubscriptionUpdateTests
+{
+    [Theory]
+    [BitAutoData(PlanType.EnterpriseMonthly2019)]
+    [BitAutoData(PlanType.EnterpriseMonthly2020)]
+    [BitAutoData(PlanType.EnterpriseMonthly)]
+    [BitAutoData(PlanType.EnterpriseAnnually2019)]
+    [BitAutoData(PlanType.EnterpriseAnnually2020)]
+    [BitAutoData(PlanType.EnterpriseAnnually)]
+    [BitAutoData(PlanType.TeamsMonthly2019)]
+    [BitAutoData(PlanType.TeamsMonthly2020)]
+    [BitAutoData(PlanType.TeamsMonthly)]
+    [BitAutoData(PlanType.TeamsAnnually2019)]
+    [BitAutoData(PlanType.TeamsAnnually2020)]
+    [BitAutoData(PlanType.TeamsAnnually)]
+    [BitAutoData(PlanType.TeamsStarter)]
+
+    public void UpgradeItemsOptions_ReturnsCorrectOptions(PlanType planType, Organization organization)
+    {
+        var plan = StaticStore.GetPlan(planType);
+        organization.PlanType = planType;
+        var quantity = 3;
+        var subscription = new Subscription
+        {
+            Items = new StripeList<SubscriptionItem>
+            {
+                Data = new List<SubscriptionItem>
+                {
+                    new ()
+                    {
+                        Id = "subscription_item",
+                        Price = new Price { Id = plan.SecretsManager.StripeSeatPlanId },
+                        Quantity = quantity
+                    }
+                }
+            }
+        };
+        var update = new SmSeatSubscriptionUpdate(organization, plan, quantity);
+
+        var options = update.UpgradeItemsOptions(subscription);
+
+        Assert.Single(options);
+        Assert.Equal(plan.SecretsManager.StripeSeatPlanId, options[0].Plan);
+        Assert.Equal(quantity, options[0].Quantity);
+        Assert.Null(options[0].Deleted);
+    }
+
+    [Theory]
+    [BitAutoData(PlanType.EnterpriseMonthly2019)]
+    [BitAutoData(PlanType.EnterpriseMonthly2020)]
+    [BitAutoData(PlanType.EnterpriseMonthly)]
+    [BitAutoData(PlanType.EnterpriseAnnually2019)]
+    [BitAutoData(PlanType.EnterpriseAnnually2020)]
+    [BitAutoData(PlanType.EnterpriseAnnually)]
+    [BitAutoData(PlanType.TeamsMonthly2019)]
+    [BitAutoData(PlanType.TeamsMonthly2020)]
+    [BitAutoData(PlanType.TeamsMonthly)]
+    [BitAutoData(PlanType.TeamsAnnually2019)]
+    [BitAutoData(PlanType.TeamsAnnually2020)]
+    [BitAutoData(PlanType.TeamsAnnually)]
+    public void RevertItemsOptions_ReturnsCorrectOptions(PlanType planType, Organization organization)
+    {
+        var plan = StaticStore.GetPlan(planType);
+        organization.PlanType = planType;
+        var quantity = 5;
+        var subscription = new Subscription
+        {
+            Items = new StripeList<SubscriptionItem>
+            {
+                Data = new List<SubscriptionItem>
+                {
+                    new ()
+                    {
+                        Id = "subscription_item",
+                        Price = new Price { Id = plan.SecretsManager.StripeSeatPlanId },
+                        Quantity = quantity
+                    }
+                }
+            }
+        };
+        var update = new SmSeatSubscriptionUpdate(organization, plan, quantity);
+        update.UpgradeItemsOptions(subscription);
+
+        var options = update.RevertItemsOptions(subscription);
+
+        Assert.Single(options);
+        Assert.Equal(plan.SecretsManager.StripeSeatPlanId, options[0].Plan);
+        Assert.Equal(organization.SmSeats, options[0].Quantity);
+        Assert.Null(options[0].Deleted);
+    }
+}
diff --git a/test/Core.Test/Models/Business/StorageSubscriptionUpdateTests.cs b/test/Core.Test/Models/Business/StorageSubscriptionUpdateTests.cs
new file mode 100644
index 0000000000..aae4e64bc7
--- /dev/null
+++ b/test/Core.Test/Models/Business/StorageSubscriptionUpdateTests.cs
@@ -0,0 +1,106 @@
+using Bit.Core.Enums;
+using Bit.Core.Models.Business;
+using Bit.Core.Utilities;
+using Bit.Test.Common.AutoFixture.Attributes;
+using Stripe;
+using Xunit;
+
+namespace Bit.Core.Test.Models.Business;
+
+public class StorageSubscriptionUpdateTests
+{
+    [Theory]
+    [BitAutoData(PlanType.EnterpriseMonthly2019)]
+    [BitAutoData(PlanType.EnterpriseMonthly2020)]
+    [BitAutoData(PlanType.EnterpriseMonthly)]
+    [BitAutoData(PlanType.EnterpriseAnnually2019)]
+    [BitAutoData(PlanType.EnterpriseAnnually2020)]
+    [BitAutoData(PlanType.EnterpriseAnnually)]
+    [BitAutoData(PlanType.TeamsMonthly2019)]
+    [BitAutoData(PlanType.TeamsMonthly2020)]
+    [BitAutoData(PlanType.TeamsMonthly)]
+    [BitAutoData(PlanType.TeamsAnnually2019)]
+    [BitAutoData(PlanType.TeamsAnnually2020)]
+    [BitAutoData(PlanType.TeamsAnnually)]
+    [BitAutoData(PlanType.TeamsStarter)]
+
+    public void UpgradeItemsOptions_ReturnsCorrectOptions(PlanType planType)
+    {
+        var plan = StaticStore.GetPlan(planType);
+        var subscription = new Subscription
+        {
+            Items = new StripeList<SubscriptionItem>
+            {
+                Data = new List<SubscriptionItem>
+                {
+                    new ()
+                    {
+                        Id = "subscription_item",
+                        Price = new Price { Id = plan.PasswordManager.StripeStoragePlanId },
+                        Quantity = 1
+                    }
+                }
+            }
+        };
+        var update = new StorageSubscriptionUpdate("plan_id", 100);
+
+        var options = update.UpgradeItemsOptions(subscription);
+
+        Assert.Single(options);
+        Assert.Equal("plan_id", options[0].Plan);
+        Assert.Equal(100, options[0].Quantity);
+        Assert.Null(options[0].Deleted);
+    }
+
+    [Fact]
+    public void RevertItemsOptions_ThrowsExceptionIfPrevStorageIsNull()
+    {
+        var subscription = new Subscription();
+        var update = new StorageSubscriptionUpdate("plan_id", 100);
+
+        Assert.Throws<Exception>(() => update.RevertItemsOptions(subscription));
+    }
+
+    [Theory]
+    [BitAutoData(PlanType.EnterpriseMonthly2019)]
+    [BitAutoData(PlanType.EnterpriseMonthly2020)]
+    [BitAutoData(PlanType.EnterpriseMonthly)]
+    [BitAutoData(PlanType.EnterpriseAnnually2019)]
+    [BitAutoData(PlanType.EnterpriseAnnually2020)]
+    [BitAutoData(PlanType.EnterpriseAnnually)]
+    [BitAutoData(PlanType.TeamsMonthly2019)]
+    [BitAutoData(PlanType.TeamsMonthly2020)]
+    [BitAutoData(PlanType.TeamsMonthly)]
+    [BitAutoData(PlanType.TeamsAnnually2019)]
+    [BitAutoData(PlanType.TeamsAnnually2020)]
+    [BitAutoData(PlanType.TeamsAnnually)]
+    [BitAutoData(PlanType.TeamsStarter)]
+    public void RevertItemsOptions_ReturnsCorrectOptions(PlanType planType)
+    {
+        var plan = StaticStore.GetPlan(planType);
+        var subscription = new Subscription
+        {
+            Items = new StripeList<SubscriptionItem>
+            {
+                Data = new List<SubscriptionItem>
+                {
+                    new ()
+                    {
+                        Id = "subscription_item",
+                        Price = new Price { Id = plan.PasswordManager.StripeStoragePlanId },
+                        Quantity = 100
+                    }
+                }
+            }
+        };
+        var update = new StorageSubscriptionUpdate(plan.PasswordManager.StripeStoragePlanId, 100);
+        update.UpgradeItemsOptions(subscription);
+
+        var options = update.RevertItemsOptions(subscription);
+
+        Assert.Single(options);
+        Assert.Equal(plan.PasswordManager.StripeStoragePlanId, options[0].Plan);
+        Assert.Equal(100, options[0].Quantity);
+        Assert.Null(options[0].Deleted);
+    }
+}