diff --git a/cpp/test/device_factory_test.cpp b/cpp/test/device_factory_test.cpp
index ce74398b..941e3264 100644
--- a/cpp/test/device_factory_test.cpp
+++ b/cpp/test/device_factory_test.cpp
@@ -30,6 +30,8 @@ TEST(DeviceFactoryTest, GetTypeForFile)
 	EXPECT_EQ(device_factory.GetTypeForFile("test.mos"), SCMO);
 	EXPECT_EQ(device_factory.GetTypeForFile("test.iso"), SCCD);
 	EXPECT_EQ(device_factory.GetTypeForFile("test.is1"), SCCD);
+	EXPECT_EQ(device_factory.GetTypeForFile("test.cdr"), SCCD);
+	EXPECT_EQ(device_factory.GetTypeForFile("test.toast"), SCCD);
 	EXPECT_EQ(device_factory.GetTypeForFile("test.suffix.iso"), SCCD);
 	EXPECT_EQ(device_factory.GetTypeForFile("bridge"), SCBR);
 	EXPECT_EQ(device_factory.GetTypeForFile("daynaport"), SCDP);
diff --git a/cpp/test/piscsi_response_test.cpp b/cpp/test/piscsi_response_test.cpp
index 510c2637..b6afb18b 100644
--- a/cpp/test/piscsi_response_test.cpp
+++ b/cpp/test/piscsi_response_test.cpp
@@ -254,5 +254,5 @@ TEST(PiscsiResponseTest, GetMappingInfo)
 
 	PbMappingInfo info;
 	response.GetMappingInfo(info);
-	EXPECT_EQ(10, info.mapping().size());
+	EXPECT_EQ(12, info.mapping().size());
 }