diff --git a/BrickController2/BrickController2.Tests/DeviceManagement/DI/CaDAVendorTests.cs b/BrickController2/BrickController2.Tests/DeviceManagement/DI/CaDAVendorTests.cs
new file mode 100644
index 00000000..ed62dff6
--- /dev/null
+++ b/BrickController2/BrickController2.Tests/DeviceManagement/DI/CaDAVendorTests.cs
@@ -0,0 +1,71 @@
+using Autofac;
+using BrickController2.DeviceManagement;
+using BrickController2.DeviceManagement.CaDA;
+using BrickController2.DeviceManagement.DI;
+using BrickController2.PlatformServices.BluetoothLE;
+using FluentAssertions;
+using Moq;
+using System;
+using Xunit;
+using CaDAVendor = BrickController2.DeviceManagement.CaDA.CaDA;
+
+namespace BrickController2.Tests.DeviceManagement.DI;
+
+public class CaDAVendorTests : VendorTestsBase
+{
+    private readonly DeviceFactory _deviceFactory;
+
+    public CaDAVendorTests()
+    {
+        // Act
+        var container = InitializeContainer().Build();
+
+        _deviceFactory = container.Resolve<DeviceFactory>();
+    }
+
+    protected override ContainerBuilder InitializeContainer()
+    {
+        var builder = base.InitializeContainer();
+
+        // Arrange
+        builder.RegisterInstance(Mock.Of<IBluetoothLEService>());
+        builder.RegisterInstance(Mock.Of<ICaDAPlatformService>());
+
+        // additional dependencies
+        builder.RegisterInstance(Random.Shared); // MessageEncoderFactory needs Random.Shared as DI
+
+        // execute registration of vendor CaDA
+        builder.RegisterModule<CaDAVendor>();
+
+        return builder;
+    }
+
+    [Theory]
+    [InlineData("Device", new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 })] // devicedata.Length of 18
+    [InlineData("Device_Rev2", new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 })]    // devicedata.Length of 16
+    public void RegisterDevice_CaDARaceCar_ReturnedDevice(string address, byte[] deviceData)
+    {
+        DeviceType deviceType = DeviceType.CaDA_RaceCar;
+        string name = "TestDevice";
+
+        var device = _deviceFactory(deviceType, name, address, deviceData, []);
+
+        device.Should().NotBeNull();
+        device.Should().BeOfType<CaDARaceCar>();
+    }
+
+    [Theory]
+    [InlineData("IllegalDevice", new byte[] { 1, 2, 3, 4 })] // MessageEncoderFactory.Create needs devicedata.Length of 16 or 18
+    public void RegisterDevice_CaDARaceCar_IllegalDeviceDataSize(string address, byte[] deviceData)
+    {
+        DeviceType deviceType = DeviceType.CaDA_RaceCar;
+        string name = "TestDevice";
+
+        Action act = () => _deviceFactory(deviceType, name, address, deviceData, []);
+
+        act.Should().Throw<Autofac.Core.DependencyResolutionException>()
+            .WithInnerException<Autofac.Core.DependencyResolutionException>()
+            .WithInnerException<InvalidOperationException>()
+            .Which.Message.Should().Be("Unsupported device data format.");
+    }
+}
diff --git a/BrickController2/BrickController2.Tests/DeviceManagement/DI/JieStarVendorTests.cs b/BrickController2/BrickController2.Tests/DeviceManagement/DI/JieStarVendorTests.cs
new file mode 100644
index 00000000..7bc73089
--- /dev/null
+++ b/BrickController2/BrickController2.Tests/DeviceManagement/DI/JieStarVendorTests.cs
@@ -0,0 +1,105 @@
+using Autofac;
+using BrickController2.DeviceManagement;
+using BrickController2.DeviceManagement.DI;
+using BrickController2.DeviceManagement.JieStar;
+using BrickController2.PlatformServices.BluetoothLE;
+using FluentAssertions;
+using Moq;
+using System;
+using Xunit;
+using JieStarVendor = BrickController2.DeviceManagement.JieStar.JieStar;
+
+namespace BrickController2.Tests.DeviceManagement.DI;
+
+public class JieStarVendorTests : VendorTestsBase
+{
+    private readonly DeviceFactory _deviceFactory;
+
+    public JieStarVendorTests()
+    {
+        // Act
+        var container = InitializeContainer().Build();
+
+        _deviceFactory = container.Resolve<DeviceFactory>();
+    }
+
+    protected override ContainerBuilder InitializeContainer()
+    {
+        var builder = base.InitializeContainer();
+
+        // Arrange
+        builder.RegisterInstance(Mock.Of<IBluetoothLEService>());
+        builder.RegisterInstance(Mock.Of<IJieStarPlatformService>());
+
+        // execute registration of vendor JIESTAR
+        builder.RegisterModule<JieStarVendor>();
+
+        return builder;
+    }
+
+    [Theory]
+    [InlineData("Device1")]
+    [InlineData("Device2")]
+    [InlineData("Device3")]
+    public void RegisterDevice_JieStar_SCM4_ReturnedDevice(string address)
+    {
+        DeviceType deviceType = DeviceType.JieStarSCM4;
+        string name = "TestDevice";
+        byte[] deviceData = [1, 2, 3];
+
+        var device = _deviceFactory(deviceType, name, address, deviceData, []);
+
+        device.Should().NotBeNull();
+        device.Should().BeOfType<JieStarSCM4>();
+    }
+
+    [Theory]
+    [InlineData("Device")]
+    [InlineData("IllegalDevice")]
+    public void RegisterDevice_JieStar_SCM4_IllegalDevice(string address)
+    {
+        DeviceType deviceType = DeviceType.JieStarSCM4;
+        string name = "TestDevice";
+        byte[] deviceData = [1, 2, 3];
+
+        Action act = () => _deviceFactory(deviceType, name, address, deviceData, []);
+
+        act.Should().Throw<Autofac.Core.DependencyResolutionException>()
+            .WithInnerException<Autofac.Core.DependencyResolutionException>()
+            .WithInnerException<ArgumentException>()
+            .Which.ParamName.Should().Be(nameof(address));
+    }
+
+    [Theory]
+    [InlineData("Device1")]
+    [InlineData("Device2")]
+    [InlineData("Device3")]
+    public void RegisterDevice_JieStar_SCM8_ReturnedDevice(string address)
+    {
+        DeviceType deviceType = DeviceType.JieStarSCM8;
+        string name = "TestDevice";
+        byte[] deviceData = [1, 2, 3];
+
+        var device = _deviceFactory(deviceType, name, address, deviceData, []);
+
+        device.Should().NotBeNull();
+        device.Should().BeOfType<JieStarSCM8>();
+    }
+
+    [Theory]
+    [InlineData("Device")]
+    [InlineData("IllegalDevice")]
+    public void RegisterDevice_JieStar_SCM8_IllegalDevice(string address)
+    {
+        DeviceType deviceType = DeviceType.JieStarSCM8;
+        string name = "TestDevice";
+        byte[] deviceData = [1, 2, 3];
+
+        Action act = () => _deviceFactory(deviceType, name, address, deviceData, []);
+
+        act.Should().Throw<Autofac.Core.DependencyResolutionException>()
+            .WithInnerException<Autofac.Core.DependencyResolutionException>()
+            .WithInnerException<ArgumentException>()
+            .Which.ParamName.Should().Be(nameof(address));
+    }
+}
diff --git a/BrickController2/BrickController2.Tests/DeviceManagement/DI/MouldKingVendorTests.cs b/BrickController2/BrickController2.Tests/DeviceManagement/DI/MouldKingVendorTests.cs
new file mode 100644
index 00000000..71e0641f
--- /dev/null
+++ b/BrickController2/BrickController2.Tests/DeviceManagement/DI/MouldKingVendorTests.cs
@@ -0,0 +1,149 @@
+using Autofac;
+using BrickController2.DeviceManagement;
+using BrickController2.DeviceManagement.DI;
+using BrickController2.DeviceManagement.MouldKing;
+using BrickController2.PlatformServices.BluetoothLE;
+using FluentAssertions;
+using Moq;
+using System;
+using Xunit;
+using MouldKingVendor = BrickController2.DeviceManagement.MouldKing.MouldKing;
+
+namespace BrickController2.Tests.DeviceManagement.DI;
+
+public class MouldKingVendorTests : VendorTestsBase
+{
+    private readonly DeviceFactory _deviceFactory;
+
+    public MouldKingVendorTests()
+    {
+        // Act
+        var container = InitializeContainer().Build();
+
+        _deviceFactory = container.Resolve<DeviceFactory>();
+    }
+
+    protected override ContainerBuilder InitializeContainer()
+    {
+        var builder = base.InitializeContainer();
+
+        // Arrange
+        builder.RegisterInstance(Mock.Of<IBluetoothLEService>());
+        builder.RegisterInstance(Mock.Of<IMKPlatformService>());
+
+        // execute registration of vendor MouldKing
+        builder.RegisterModule<MouldKingVendor>();
+
+        return builder;
+    }
+
+    [Theory]
+    [InlineData("Device")]        // The address is not relevant for this device
+    [InlineData("IllegalDevice")] // The address is not relevant for this device
+    public void RegisterDevice_MK3_8_ReturnedDevice(string address)
+    {
+        DeviceType deviceType = DeviceType.MK3_8;
+        string name = "TestDevice";
+        byte[] deviceData = [1, 2, 3];
+
+        var device = _deviceFactory(deviceType, name, address, deviceData, []);
+
+        device.Should().NotBeNull();
+        device.Should().BeOfType<MK3_8>();
+    }
+
+    [Theory]
+    [InlineData("Device")]
+    [InlineData("IllegalDevice")]
+    public void RegisterDevice_MK4_IllegalDevice(string address)
+    {
+        DeviceType deviceType = DeviceType.MK4;
+        string name = "TestDevice";
+        byte[] deviceData = [1, 2, 3];
+
+        Action act = () => _deviceFactory(deviceType, name, address, deviceData, []);
+
+        act.Should().Throw<Autofac.Core.DependencyResolutionException>()
+            .WithInnerException<Autofac.Core.DependencyResolutionException>()
+            .WithInnerException<ArgumentException>()
+            .Which.ParamName.Should().Be(nameof(address));
+    }
+
+    [Theory]
+    [InlineData("Device1")]
+    [InlineData("Device2")]
+    [InlineData("Device3")]
+    public void RegisterDevice_MK4_ReturnedDevice(string address)
+    {
+        DeviceType deviceType = DeviceType.MK4;
+        string name = "TestDevice";
+        byte[] deviceData = [1, 2, 3];
+
+        var device = _deviceFactory(deviceType, name, address, deviceData, []);
+
+        device.Should().NotBeNull();
+        device.Should().BeOfType<MK4>();
+    }
+
+    [Theory]
+    [InlineData("Device")]        // The address is not relevant for this device
+    [InlineData("IllegalDevice")] // The address is not relevant for this device
+    public void RegisterDevice_MK5_ReturnedDevice(string address)
+    {
+        DeviceType deviceType = DeviceType.MK5;
+        string name = "TestDevice";
+        byte[] deviceData = [1, 2, 3];
+
+        var device = _deviceFactory(deviceType, name, address, deviceData, []);
+
+        device.Should().NotBeNull();
+        device.Should().BeOfType<MK5>();
+    }
+
+    [Theory]
+    [InlineData("Device1")]
+    [InlineData("Device2")]
+    [InlineData("Device3")]
+    public void RegisterDevice_MK6_ReturnedDevice(string address)
+    {
+        DeviceType deviceType = DeviceType.MK6;
+        string name = "TestDevice";
+        byte[] deviceData = [1, 2, 3];
+
+        var device = _deviceFactory(deviceType, name, address, deviceData, []);
+
+        device.Should().NotBeNull();
+        device.Should().BeOfType<MK6>();
+    }
+
+    [Theory]
+    [InlineData("Device")]
+    [InlineData("IllegalDevice")]
+    public void RegisterDevice_MK6_IllegalDevice(string address)
+    {
+        DeviceType deviceType = DeviceType.MK6;
+        string name = "TestDevice";
+        byte[] deviceData = [1, 2, 3];
+
+        Action act = () => _deviceFactory(deviceType, name, address, deviceData, []);
+
+        act.Should().Throw<Autofac.Core.DependencyResolutionException>()
+            .WithInnerException<Autofac.Core.DependencyResolutionException>()
+            .WithInnerException<ArgumentException>()
+            .Which.ParamName.Should().Be(nameof(address));
+    }
+
+    [Theory]
+    [InlineData("MK_DIY_Address")]
+    public void RegisterDevice_MKDIY_ReturnedDevice(string address)
+    {
+        DeviceType deviceType = DeviceType.MK_DIY;
+        string name = "TestDevice";
+        byte[] deviceData = [1, 2, 3];
+
+        var device = _deviceFactory(deviceType, name, address, deviceData, []);
+
+        device.Should().NotBeNull();
+        device.Should().BeOfType<MK_DIY>();
+    }
+}
diff --git a/BrickController2/BrickController2.Tests/DeviceManagement/DI/PowerFunctionsVendorTests.cs b/BrickController2/BrickController2.Tests/DeviceManagement/DI/PowerFunctionsVendorTests.cs
new file mode 100644
index 00000000..04c62b1f
--- /dev/null
+++ b/BrickController2/BrickController2.Tests/DeviceManagement/DI/PowerFunctionsVendorTests.cs
@@ -0,0 +1,55 @@
+using Autofac;
+using BrickController2.DeviceManagement;
+using BrickController2.DeviceManagement.DI;
+using BrickController2.DeviceManagement.PowerFunctions;
+using BrickController2.PlatformServices.Infrared;
+using BrickController2.UI.Images;
+using FluentAssertions;
+using Moq;
+using Xunit;
+using PowerFunctionsVendor = BrickController2.DeviceManagement.PowerFunctions.PowerFunctions;
+
+namespace BrickController2.Tests.DeviceManagement.DI;
+
+public class PowerFunctionsVendorTests : VendorTestsBase
+{
+    private readonly DeviceFactory _deviceFactory;
+
+    public PowerFunctionsVendorTests()
+    {
+        // Act
+        var container = InitializeContainer().Build();
+
+        _deviceFactory = container.Resolve<DeviceFactory>();
+    }
+
+    protected override ContainerBuilder InitializeContainer()
+    {
+        var builder = base.InitializeContainer();
+
+        // Arrange
+        builder.RegisterInstance(Mock.Of<IInfraredService>());
+        builder.RegisterInstance(Mock.Of<IDeviceImageRegistry>()); // needed because RegisterDevice<PowerFunctionsDevice>().WithImages("powerfunctions_image.png", "powerfunctions_image_small.png")
+
+        // execute registration of vendor PowerFunctions
+        builder.RegisterModule<PowerFunctionsVendor>();
+
+        return builder;
+    }
+
+
+    [Theory]
+    [InlineData("0", "PF Infra 1")]
+    [InlineData("1", "PF Infra 2")]
+    [InlineData("2", "PF Infra 3")]
+    [InlineData("3", "PF Infra 4")]
+    public void RegisterDevice_PowerFunctionsDevice_ReturnedDevice(string address, string name)
+    {
+        DeviceType deviceType = DeviceType.Infrared;
+
+        var device = _deviceFactory(deviceType, name, address, [], []);
+
+        device.Should().NotBeNull();
+        device.Should().BeOfType<PowerFunctionsDevice>();
+    }
+}
diff --git a/BrickController2/BrickController2.Tests/DeviceManagement/DI/VendorBuilderTests.cs b/BrickController2/BrickController2.Tests/DeviceManagement/DI/VendorBuilderTests.cs
deleted file mode 100644
index cf7429b4..00000000
--- a/BrickController2/BrickController2.Tests/DeviceManagement/DI/VendorBuilderTests.cs
+++ /dev/null
@@ -1,416 +0,0 @@
-using Autofac;
-using BrickController2.DeviceManagement;
-using BrickController2.DeviceManagement.DI;
-using BrickController2.DeviceManagement.JieStar;
-using BrickController2.DeviceManagement.MouldKing;
-using BrickController2.PlatformServices.BluetoothLE;
-using BrickController2.UI.Services.AppIdentifier;
-using FluentAssertions;
-using Moq;
-using System;
-using Xunit;
-using JieStarVendor = BrickController2.DeviceManagement.JieStar.JieStar;
-using MouldKingVendor = BrickController2.DeviceManagement.MouldKing.MouldKing;
-
-namespace BrickController2.Tests.DeviceManagement.DI;
-
-public class VendorBuilderTests
-{
-    [Theory]
-    [InlineData("Device1")]
-    [InlineData("Device2")]
-    [InlineData("Device3")]
-    public void RegisterDevice_JieStar_SCM4_ReturnedDevice(string address)
-    {
-        // Arrange
-        var builder = new ContainerBuilder();
-        builder.RegisterInstance(Mock.Of<IDeviceRepository>());
-        builder.RegisterInstance(Mock.Of<IBluetoothLEService>());
-        builder.RegisterInstance(Mock.Of<IJieStarPlatformService>());
-
-        Mock<IAppIdentifierService> appIdentifierService = new();
-        appIdentifierService.Setup(x => x.GetAppId(2)).Returns(new byte[] { 0x01, 0x02 });
-
-        builder.RegisterInstance(appIdentifierService.Object);
-        builder.RegisterType<JieStarDeviceManager>();
-
-        var vendorBuilder = new VendorBuilder<JieStarVendor>(builder, new JieStarVendor());
-
-        // Act
-        var deviceBuilder = vendorBuilder.RegisterDevice<JieStarSCM4>();
-        var container = builder.Build();
-
-        // Assert
-        deviceBuilder.Should().BeOfType<DeviceBuilder<JieStarVendor, JieStarSCM4>>();
-
-        string name = "TestDevice";
-        byte[] deviceData = [1, 2, 3];
-        var device = container.ResolveKeyed<Device>(DeviceType.JieStarSCM4,
-            new NamedParameter(nameof(name), name),
-            new NamedParameter(nameof(address), address),
-            new NamedParameter(nameof(deviceData), deviceData));
-
-        device.Should().NotBeNull();
-        device.Should().BeOfType<JieStarSCM4>();
-    }
-
-    [Theory]
-    [InlineData("Device")]
-    [InlineData("IllegalDevice")]
-    public void RegisterDevice_JieStar_SCM4_IllegalDevice(string address)
-    {
-        // Arrange
-        var builder = new ContainerBuilder();
-        builder.RegisterInstance(Mock.Of<IDeviceRepository>());
-        builder.RegisterInstance(Mock.Of<IBluetoothLEService>());
-        builder.RegisterInstance(Mock.Of<IJieStarPlatformService>());
-
-        Mock<IAppIdentifierService> appIdentifierService = new();
-        appIdentifierService.Setup(x => x.GetAppId(2)).Returns(new byte[] { 0x01, 0x02 });
-
-        builder.RegisterInstance(appIdentifierService.Object);
-        builder.RegisterType<JieStarDeviceManager>();
-
-        var vendorBuilder = new VendorBuilder<JieStarVendor>(builder, new JieStarVendor());
-
-        // Act
-        var deviceBuilder = vendorBuilder.RegisterDevice<JieStarSCM4>();
-        var container = builder.Build();
-
-        // Assert
-        deviceBuilder.Should().BeOfType<DeviceBuilder<JieStarVendor, JieStarSCM4>>();
-
-        string name = "TestDevice";
-        byte[] deviceData = [1, 2, 3];
-
-        Action act = () => container.ResolveKeyed<Device>(DeviceType.JieStarSCM4,
-            new NamedParameter(nameof(name), name),
-            new NamedParameter(nameof(address), address),
-            new NamedParameter(nameof(deviceData), deviceData));
-
-        act.Should().Throw<Autofac.Core.DependencyResolutionException>()
-            .WithInnerException<Autofac.Core.DependencyResolutionException>()
-            .WithInnerException<ArgumentException>()
-            .Which.ParamName.Should().Be(nameof(address));
-    }
-
-    [Theory]
-    [InlineData("Device1")]
-    [InlineData("Device2")]
-    [InlineData("Device3")]
-    public void RegisterDevice_JieStar_SCM8_ReturnedDevice(string address)
-    {
-        // Arrange
-        var builder = new ContainerBuilder();
-        builder.RegisterInstance(Mock.Of<IDeviceRepository>());
-        builder.RegisterInstance(Mock.Of<IBluetoothLEService>());
-        builder.RegisterInstance(Mock.Of<IJieStarPlatformService>());
-
-        Mock<IAppIdentifierService> appIdentifierService = new();
-        appIdentifierService.Setup(x => x.GetAppId(2)).Returns(new byte[] { 0x01, 0x02 });
-
-        builder.RegisterInstance(appIdentifierService.Object);
-        builder.RegisterType<JieStarDeviceManager>();
-
-        var vendorBuilder = new VendorBuilder<JieStarVendor>(builder, new JieStarVendor());
-
-        // Act
-        var deviceBuilder = vendorBuilder.RegisterDevice<JieStarSCM8>();
-        var container = builder.Build();
-
-        // Assert
-        deviceBuilder.Should().BeOfType<DeviceBuilder<JieStarVendor, JieStarSCM8>>();
-
-        string name = "TestDevice";
-        byte[] deviceData = [1, 2, 3];
-        var device = container.ResolveKeyed<Device>(DeviceType.JieStarSCM8,
-            new NamedParameter(nameof(name), name),
-            new NamedParameter(nameof(address), address),
-            new NamedParameter(nameof(deviceData), deviceData));
-
-        device.Should().NotBeNull();
-        device.Should().BeOfType<JieStarSCM8>();
-    }
-
-    [Theory]
-    [InlineData("Device")]
-    [InlineData("IllegalDevice")]
-    public void RegisterDevice_JieStar_SCM8_IllegalDevice(string address)
-    {
-        // Arrange
-        var builder = new ContainerBuilder();
-        builder.RegisterInstance(Mock.Of<IDeviceRepository>());
-        builder.RegisterInstance(Mock.Of<IBluetoothLEService>());
-        builder.RegisterInstance(Mock.Of<IJieStarPlatformService>());
-
-        Mock<IAppIdentifierService> appIdentifierService = new();
-        appIdentifierService.Setup(x => x.GetAppId(2)).Returns(new byte[] { 0x01, 0x02 });
-
-        builder.RegisterInstance(appIdentifierService.Object);
-        builder.RegisterType<JieStarDeviceManager>();
-
-        var vendorBuilder = new VendorBuilder<JieStarVendor>(builder, new JieStarVendor());
-
-        // Act
-        var deviceBuilder = vendorBuilder.RegisterDevice<JieStarSCM8>();
-        var container = builder.Build();
-
-        // Assert
-        deviceBuilder.Should().BeOfType<DeviceBuilder<JieStarVendor, JieStarSCM8>>();
-
-        string name = "TestDevice";
-        byte[] deviceData = [1, 2, 3];
-
-        Action act = () => container.ResolveKeyed<Device>(DeviceType.JieStarSCM8,
-            new NamedParameter(nameof(name), name),
-            new NamedParameter(nameof(address), address),
-            new NamedParameter(nameof(deviceData), deviceData));
-
-        act.Should().Throw<Autofac.Core.DependencyResolutionException>()
-            .WithInnerException<Autofac.Core.DependencyResolutionException>()
-            .WithInnerException<ArgumentException>()
-            .Which.ParamName.Should().Be(nameof(address));
-    }
-
-    [Theory]
-    [InlineData("Device")]        // The address is not relevant for this device
-    [InlineData("IllegalDevice")] // The address is not relevant for this device
-    public void RegisterDevice_MK3_8_ReturnedDevice(string address)
-    {
-        // Arrange
-        var builder = new ContainerBuilder();
-        builder.RegisterInstance(Mock.Of<IDeviceRepository>());
-        builder.RegisterInstance(Mock.Of<IBluetoothLEService>());
-        builder.RegisterInstance(Mock.Of<IMKPlatformService>());
-
-        Mock<IAppIdentifierService> appIdentifierService = new();
-        appIdentifierService.Setup(x => x.GetAppId(2)).Returns(new byte[] { 0x01, 0x02 });
-
-        builder.RegisterInstance(appIdentifierService.Object);
-        builder.RegisterType<MouldKingDeviceManager>()
-            .As<IMouldKingDeviceManager>()
-            .SingleInstance();
-
-        var vendorBuilder = new VendorBuilder<MouldKingVendor>(builder, new MouldKingVendor());
-
-        // Act
-        var deviceBuilder = vendorBuilder.RegisterDevice<MK3_8>();
-        var container = builder.Build();
-
-        // Assert
-        deviceBuilder.Should().BeOfType<DeviceBuilder<MouldKingVendor, MK3_8>>();
-
-        string name = "TestDevice";
-        byte[] deviceData = [1, 2, 3];
-        var device = container.ResolveKeyed<Device>(DeviceType.MK3_8,
-            new NamedParameter(nameof(name), name),
-            new NamedParameter(nameof(address), address),
-            new NamedParameter(nameof(deviceData), deviceData));
-
-        device.Should().NotBeNull();
-        device.Should().BeOfType<MK3_8>();
-    }
-
-    [Theory]
-    [InlineData("Device")]
-    [InlineData("IllegalDevice")]
-    public void RegisterDevice_MK4_IllegalDevice(string address)
-    {
-        // Arrange
-        var builder = new ContainerBuilder();
-        builder.RegisterInstance(Mock.Of<IDeviceRepository>());
-        builder.RegisterInstance(Mock.Of<IBluetoothLEService>());
-        builder.RegisterInstance(Mock.Of<IMKPlatformService>());
-
-        Mock<IAppIdentifierService> appIdentifierService = new();
-        appIdentifierService.Setup(x => x.GetAppId(2)).Returns(new byte[] { 0x01, 0x02 });
-
-        builder.RegisterInstance(appIdentifierService.Object);
-        builder.RegisterType<MouldKingDeviceManager>()
-            .As<IMouldKingDeviceManager>()
-            .SingleInstance();
-
-        var vendorBuilder = new VendorBuilder<MouldKingVendor>(builder, new MouldKingVendor());
-
-        // Act
-        var deviceBuilder = vendorBuilder.RegisterDevice<MK4>();
-        var container = builder.Build();
-
-        // Assert
-        deviceBuilder.Should().BeOfType<DeviceBuilder<MouldKingVendor, MK4>>();
-
-        string name = "TestDevice";
-        byte[] deviceData = [1, 2, 3];
-
-        Action act = () => container.ResolveKeyed<Device>(DeviceType.MK4,
-            new NamedParameter(nameof(name), name),
-            new NamedParameter(nameof(address), address),
-            new NamedParameter(nameof(deviceData), deviceData));
-
-        act.Should().Throw<Autofac.Core.DependencyResolutionException>()
-            .WithInnerException<Autofac.Core.DependencyResolutionException>()
-            .WithInnerException<ArgumentException>()
-            .Which.ParamName.Should().Be(nameof(address));
-    }
-
-    [Theory]
-    [InlineData("Device1")]
-    [InlineData("Device2")]
-    [InlineData("Device3")]
-    public void RegisterDevice_MK4_ReturnedDevice(string address)
-    {
-        // Arrange
-        var builder = new ContainerBuilder();
-        builder.RegisterInstance(Mock.Of<IDeviceRepository>());
-        builder.RegisterInstance(Mock.Of<IBluetoothLEService>());
-        builder.RegisterInstance(Mock.Of<IMKPlatformService>());
-
-        Mock<IAppIdentifierService> appIdentifierService = new();
-        appIdentifierService.Setup(x => x.GetAppId(2)).Returns(new byte[] { 0x01, 0x02 });
-
-        builder.RegisterInstance(appIdentifierService.Object);
-        builder.RegisterType<MouldKingDeviceManager>()
-            .As<IMouldKingDeviceManager>()
-            .SingleInstance();
-
-        var vendorBuilder = new VendorBuilder<MouldKingVendor>(builder, new MouldKingVendor());
-
-        // Act
-        var deviceBuilder = vendorBuilder.RegisterDevice<MK4>();
-        var container = builder.Build();
-
-        // Assert
-        deviceBuilder.Should().BeOfType<DeviceBuilder<MouldKingVendor, MK4>>();
-
-        string name = "TestDevice";
-        byte[] deviceData = [1, 2, 3];
-        var device = container.ResolveKeyed<Device>(DeviceType.MK4,
-            new NamedParameter(nameof(name), name),
-            new NamedParameter(nameof(address), address),
-            new NamedParameter(nameof(deviceData), deviceData));
-
-        device.Should().NotBeNull();
-        device.Should().BeOfType<MK4>();
-    }
-
-    [Theory]
-    [InlineData("Device")]        // The address is not relevant for this device
-    [InlineData("IllegalDevice")] // The address is not relevant for this device
-    public void RegisterDevice_MK5_ReturnedDevice(string address)
-    {
-        // Arrange
-        var builder = new ContainerBuilder();
-        builder.RegisterInstance(Mock.Of<IDeviceRepository>());
-        builder.RegisterInstance(Mock.Of<IBluetoothLEService>());
-        builder.RegisterInstance(Mock.Of<IMKPlatformService>());
-
-        Mock<IAppIdentifierService> appIdentifierService = new();
-        appIdentifierService.Setup(x => x.GetAppId(2)).Returns(new byte[] { 0x01, 0x02 });
-
-        builder.RegisterInstance(appIdentifierService.Object);
-        builder.RegisterType<MouldKingDeviceManager>()
-            .As<IMouldKingDeviceManager>()
-            .SingleInstance();
-
-        var vendorBuilder = new VendorBuilder<MouldKingVendor>(builder, new MouldKingVendor());
-
-        // Act
-        var deviceBuilder = vendorBuilder.RegisterDevice<MK5>();
-        var container = builder.Build();
-
-        // Assert
-        deviceBuilder.Should().BeOfType<DeviceBuilder<MouldKingVendor, MK5>>();
-
-        string name = "TestDevice";
-        byte[] deviceData = [1, 2, 3];
-        var device = container.ResolveKeyed<Device>(DeviceType.MK5,
-            new NamedParameter(nameof(name), name),
-            new NamedParameter(nameof(address), address),
-            new NamedParameter(nameof(deviceData), deviceData));
-
-        device.Should().NotBeNull();
-        device.Should().BeOfType<MK5>();
-    }
-
-    [Theory]
-    [InlineData("Device1")]
-    [InlineData("Device2")]
-    [InlineData("Device3")]
-    public void RegisterDevice_MK6_ReturnedDevice(string address)
-    {
-        // Arrange
-        var builder = new ContainerBuilder();
-        builder.RegisterInstance(Mock.Of<IDeviceRepository>());
-        builder.RegisterInstance(Mock.Of<IBluetoothLEService>());
-        builder.RegisterInstance(Mock.Of<IMKPlatformService>());
-
-        Mock<IAppIdentifierService> appIdentifierService = new();
-        appIdentifierService.Setup(x => x.GetAppId(2)).Returns(new byte[] { 0x01, 0x02 });
-
-        builder.RegisterInstance(appIdentifierService.Object);
-        builder.RegisterType<MouldKingDeviceManager>()
-            .As<IMouldKingDeviceManager>()
-            .SingleInstance();
-
-        var vendorBuilder = new VendorBuilder<MouldKingVendor>(builder, new MouldKingVendor());
-
-        // Act
-        var deviceBuilder = vendorBuilder.RegisterDevice<MK6>();
-        var container = builder.Build();
-
-        // Assert
-        deviceBuilder.Should().BeOfType<DeviceBuilder<MouldKingVendor, MK6>>();
-
-        string name = "TestDevice";
-        byte[] deviceData = [1, 2, 3];
-        var device = container.ResolveKeyed<Device>(DeviceType.MK6,
-            new NamedParameter(nameof(name), name),
-            new NamedParameter(nameof(address), address),
-            new NamedParameter(nameof(deviceData), deviceData));
-
-        device.Should().NotBeNull();
-        device.Should().BeOfType<MK6>();
-    }
-
-    [Theory]
-    [InlineData("Device")]
-    [InlineData("IllegalDevice")]
-    public void RegisterDevice_MK6_IllegalDevice(string address)
-    {
-        // Arrange
-        var builder = new ContainerBuilder();
-        builder.RegisterInstance(Mock.Of<IDeviceRepository>());
-        builder.RegisterInstance(Mock.Of<IBluetoothLEService>());
-        builder.RegisterInstance(Mock.Of<IMKPlatformService>());
-
-        Mock<IAppIdentifierService> appIdentifierService = new();
-        appIdentifierService.Setup(x => x.GetAppId(2)).Returns(new byte[] { 0x01, 0x02 });
-
-        builder.RegisterInstance(appIdentifierService.Object);
-        builder.RegisterType<MouldKingDeviceManager>()
-            .As<IMouldKingDeviceManager>()
-            .SingleInstance();
-
-        var vendorBuilder = new VendorBuilder<MouldKingVendor>(builder, new MouldKingVendor());
-
-        // Act
-        var deviceBuilder = vendorBuilder.RegisterDevice<MK6>();
-        var container = builder.Build();
-
-        // Assert
-        deviceBuilder.Should().BeOfType<DeviceBuilder<MouldKingVendor, MK6>>();
-
-        string name = "TestDevice";
-        byte[] deviceData = [1, 2, 3];
-
-        Action act = () => container.ResolveKeyed<Device>(DeviceType.MK6,
-            new NamedParameter(nameof(name), name),
-            new NamedParameter(nameof(address), address),
-            new NamedParameter(nameof(deviceData), deviceData));
-
-        act.Should().Throw<Autofac.Core.DependencyResolutionException>()
-            .WithInnerException<Autofac.Core.DependencyResolutionException>()
-            .WithInnerException<ArgumentException>()
-            .Which.ParamName.Should().Be(nameof(address));
-    }
-}
diff --git a/BrickController2/BrickController2.Tests/DeviceManagement/DI/VendorTestsBase.cs b/BrickController2/BrickController2.Tests/DeviceManagement/DI/VendorTestsBase.cs
new file mode 100644
index 00000000..d0457ef3
--- /dev/null
+++ b/BrickController2/BrickController2.Tests/DeviceManagement/DI/VendorTestsBase.cs
@@ -0,0 +1,33 @@
+using Autofac;
+using BrickController2.DeviceManagement;
+using BrickController2.UI.Services.AppIdentifier;
+using Moq;
+
+namespace BrickController2.Tests.DeviceManagement.DI;
+
+public class VendorTestsBase
+{
+    protected virtual ContainerBuilder InitializeContainer()
+    {
+        // Arrange
+        var builder = new ContainerBuilder();
+        builder.RegisterInstance(Mock.Of<IDeviceRepository>());
+
+        Mock<IAppIdentifierService> appIdentifierService = new();
+        appIdentifierService.Setup(x => x.GetAppId(2)).Returns(new byte[] { 0x01, 0x02 }); // MouldKing needs an AppId of 2 Bytes
+        appIdentifierService.Setup(x => x.GetAppId(3)).Returns(new byte[] { 0x01, 0x02, 0x03 }); // CaDA needs an AppId of 3 Bytes
+        builder.RegisterInstance(appIdentifierService.Object);
+
+        builder.Register<DeviceFactory>(c =>
+        {
+            IComponentContext ctx = c.Resolve<IComponentContext>();
+            return (deviceType, name, address, deviceData, settings) => ctx.ResolveOptionalKeyed<Device>(deviceType,
+                new NamedParameter("name", name),
+                new NamedParameter("address", address),
+                new NamedParameter("deviceData", deviceData),
+                new NamedParameter("settings", settings));
+        });
+
+        return builder;
+    }
+}