diff --git a/nanoFirmwareFlasher.Tests/FirmwarePackageTests.cs b/nanoFirmwareFlasher.Tests/FirmwarePackageTests.cs
index 6c908086..f451e998 100644
--- a/nanoFirmwareFlasher.Tests/FirmwarePackageTests.cs
+++ b/nanoFirmwareFlasher.Tests/FirmwarePackageTests.cs
@@ -20,30 +20,74 @@ public class FirmwarePackageTests
         [TestCategory("CloudSmith")]
         public void FirmwarePackage_ListReferenceTargets()
         {
-            #region Get the stable packages
+            #region Get the preview packages
 
-            List<CloudSmithPackageDetail> stable = FirmwarePackage.GetTargetList(
-                false,
+            List<CloudSmithPackageDetail> preview = FirmwarePackage.GetTargetList(
                 false,
+                true,
                 null,
+                VerbosityLevel.Quiet);
+
+            Assert.IsNotNull(preview);
+            Assert.AreNotEqual(0, preview.Count);
+
+            #endregion
+
+            #region Get the platform-filtered stable packages
+
+            List<CloudSmithPackageDetail> stableEsp32 = FirmwarePackage.GetTargetList(
+                false,
+                false,
+                SupportedPlatform.esp32,
                 VerbosityLevel.Diagnostic);
 
-            Assert.IsNotNull(stable);
-            Assert.AreNotEqual(0, stable.Count);
+            Assert.IsNotNull(stableEsp32);
+            Assert.AreNotEqual(0, stableEsp32.Count);
+
+            List<CloudSmithPackageDetail> stableTiSimpleLink = FirmwarePackage.GetTargetList(
+                false,
+                false,
+                SupportedPlatform.ti_simplelink,
+                VerbosityLevel.Quiet);
+
+            Assert.IsNotNull(stableTiSimpleLink);
+            Assert.AreNotEqual(0, stableTiSimpleLink.Count);
+
+            List<CloudSmithPackageDetail> stableStm32 = FirmwarePackage.GetTargetList(
+                false,
+                false,
+                SupportedPlatform.stm32,
+                VerbosityLevel.Quiet);
+
+            Assert.IsNotNull(stableStm32);
+            Assert.AreNotEqual(0, stableStm32.Count);
+
+            List<CloudSmithPackageDetail> stableEfm32 = FirmwarePackage.GetTargetList(
+                false,
+                false,
+                SupportedPlatform.efm32,
+                VerbosityLevel.Quiet);
+
+            Assert.IsNotNull(stableEfm32);
+            Assert.AreNotEqual(0, stableEfm32.Count);
 
             #endregion
 
-            #region Get the preview packages
+            #region Get the stable packages (fetched last to guarantee it is a superset of the filtered lists)
 
-            List<CloudSmithPackageDetail> preview = FirmwarePackage.GetTargetList(
+            List<CloudSmithPackageDetail> stable = FirmwarePackage.GetTargetList(
+                false,
                 false,
-                true,
                 null,
-                VerbosityLevel.Quiet);
+                VerbosityLevel.Diagnostic);
 
-            Assert.IsNotNull(preview);
+            Assert.IsNotNull(stable);
+            Assert.AreNotEqual(0, stable.Count);
+
+            #endregion
+
+            #region Assert preview packages are not in the stable list
 
-            // Assert that the preview packages are not part of the stable package list
             foreach (CloudSmithPackageDetail previewPackage in preview)
             {
                 Assert.IsFalse((from s in stable
@@ -53,21 +97,10 @@ public void FirmwarePackage_ListReferenceTargets()
 
             #endregion
 
-            #region Get the stable esp32 packages
-
-            List<CloudSmithPackageDetail> stableEsp32 = FirmwarePackage.GetTargetList(
-                false,
-                false,
-                SupportedPlatform.esp32,
-                VerbosityLevel.Diagnostic);
-
-            Assert.IsNotNull(stableEsp32);
-            Assert.AreNotEqual(0, stableEsp32.Count);
+            #region Assert all esp32 packages are in the stable list
 
-            // Assert that there are more stable packages than for the esp32
             Assert.IsTrue(stableEsp32.Count < stable.Count);
 
-            // Assert that all esp32 packages are in the stable list
             foreach (CloudSmithPackageDetail esp32Package in stableEsp32)
             {
                 Assert.IsTrue(stable.Any(s => s.Name == esp32Package.Name && s.Version == esp32Package.Version),
@@ -76,21 +109,10 @@ public void FirmwarePackage_ListReferenceTargets()
 
             #endregion
 
-            #region Get the stable ti_simplelink packages
+            #region Assert all ti_simplelink packages are in the stable list
 
-            List<CloudSmithPackageDetail> stableTiSimpleLink = FirmwarePackage.GetTargetList(
-                false,
-                false,
-                SupportedPlatform.ti_simplelink,
-                VerbosityLevel.Quiet);
-
-            Assert.IsNotNull(stableTiSimpleLink);
-            Assert.AreNotEqual(0, stableTiSimpleLink.Count);
-
-            // Assert that there are more stable packages than for the ti_simplelink
             Assert.IsTrue(stableTiSimpleLink.Count < stable.Count);
 
-            // Assert that all ti_simplelink packages are in the stable list
             foreach (CloudSmithPackageDetail tiSimpleLinkPackage in stableTiSimpleLink)
             {
                 Assert.IsTrue(stable.Any(s => s.Name == tiSimpleLinkPackage.Name && s.Version == tiSimpleLinkPackage.Version),
@@ -99,21 +121,10 @@ public void FirmwarePackage_ListReferenceTargets()
 
             #endregion
 
-            #region Get the stable stm32 packages
+            #region Assert all stm32 packages are in the stable list
 
-            List<CloudSmithPackageDetail> stableStm32 = FirmwarePackage.GetTargetList(
-                false,
-                false,
-                SupportedPlatform.stm32,
-                VerbosityLevel.Quiet);
-
-            Assert.IsNotNull(stableStm32);
-            Assert.AreNotEqual(0, stableStm32.Count);
-
-            // Assert that there are more stable packages than for the stm32
             Assert.IsTrue(stableStm32.Count < stable.Count);
 
-            // Assert that all stm32 packages are in the stable list
             foreach (CloudSmithPackageDetail stm32Package in stableStm32)
             {
                 Assert.IsTrue(stable.Any(s => s.Name == stm32Package.Name && s.Version == stm32Package.Version),
@@ -122,21 +133,10 @@ public void FirmwarePackage_ListReferenceTargets()
 
             #endregion
 
-            #region Get the stable efm32 packages
-
-            List<CloudSmithPackageDetail> stableEfm32 = FirmwarePackage.GetTargetList(
-                false,
-                false,
-                SupportedPlatform.efm32,
-                VerbosityLevel.Quiet);
-
-            Assert.IsNotNull(stableEfm32);
-            Assert.AreNotEqual(0, stableEfm32.Count);
+            #region Assert all efm32 packages are in the stable list
 
-            // Assert that there are more stable packages than for the efm32
             Assert.IsTrue(stableEfm32.Count < stable.Count);
 
-            // Assert that all efm32 packages are in the stable list
             foreach (CloudSmithPackageDetail efm32Package in stableEfm32)
             {
                 Assert.IsTrue(stable.Any(s => s.Name == efm32Package.Name && s.Version == efm32Package.Version),