diff --git a/cpp/test/device_factory_test.cpp b/cpp/test/device_factory_test.cpp
index 941e3264..ae56e4b4 100644
--- a/cpp/test/device_factory_test.cpp
+++ b/cpp/test/device_factory_test.cpp
@@ -46,7 +46,7 @@ TEST(DeviceFactoryTest, GetExtensionMapping)
 	DeviceFactory device_factory;
 
 	auto mapping = device_factory.GetExtensionMapping();
-	EXPECT_EQ(10, mapping.size());
+	EXPECT_EQ(12, mapping.size());
 	EXPECT_EQ(SCHD, mapping["hd1"]);
 	EXPECT_EQ(SCHD, mapping["hds"]);
 	EXPECT_EQ(SCHD, mapping["hda"]);
@@ -57,6 +57,8 @@ TEST(DeviceFactoryTest, GetExtensionMapping)
 	EXPECT_EQ(SCMO, mapping["mos"]);
 	EXPECT_EQ(SCCD, mapping["iso"]);
 	EXPECT_EQ(SCCD, mapping["is1"]);
+	EXPECT_EQ(SCCD, mapping["cdr"]);
+	EXPECT_EQ(SCCD, mapping["toast"]);
 }
 
 TEST(DeviceFactoryTest, UnknownDeviceType)