diff --git a/tests/mock_class_map.php b/tests/mock_class_map.php
index 62f202e5..8db6d20a 100644
--- a/tests/mock_class_map.php
+++ b/tests/mock_class_map.php
@@ -139,6 +139,11 @@ abstract class CustomerMessageCore extends MockPsCustomerMessage { }
 
 final class CustomerMessage extends CustomerMessageCore { }
 
+/** @see \GenderCore */
+abstract class GenderCore extends ObjectModel { }
+
+final class Gender extends GenderCore { }
+
 /** @see \GroupCore */
 abstract class GroupCore extends ObjectModel { }
 
@@ -149,13 +154,18 @@ abstract class LangCore extends ObjectModel { }
 
 final class Lang extends LangCore { }
 
+/** @see \ManufacturerCore */
+abstract class ManufacturerCore extends ObjectModel { }
+
+final class Manufacturer extends ManufacturerCore { }
+
 /** @see \OrderCore */
 abstract class OrderCore extends MockPsOrder { }
 
 final class Order extends OrderCore { }
 
 /** @see \OrderStateCore */
-abstract class OrderStateCore extends MockPsObjectModel { }
+abstract class OrderStateCore extends ObjectModel { }
 
 final class OrderState extends OrderStateCore { }
 
@@ -169,6 +179,11 @@ abstract class RangeWeightCore extends MockPsRangeObjectModel { }
 
 final class RangeWeight extends RangeWeightCore { }
 
+/** @see \RiskCore */
+abstract class RiskCore extends ObjectModel { }
+
+final class Risk extends RiskCore { }
+
 /** @see \ShopCore */
 abstract class ShopCore extends ObjectModel { }
 
@@ -184,6 +199,16 @@ abstract class StateCore extends ObjectModel { }
 
 final class State extends StateCore { }
 
+/** @see \SupplierCore */
+abstract class SupplierCore extends ObjectModel { }
+
+final class Supplier extends SupplierCore { }
+
+/** @see \WarehouseCore */
+abstract class WarehouseCore extends ObjectModel { }
+
+final class Warehouse extends WarehouseCore { }
+
 /** @see \ZoneCore */
 abstract class ZoneCore extends ObjectModel { }