diff --git a/test/unit/extract_cb_convenience_test.js b/test/unit/extract_cb_convenience_test.js
index f4ad2cb..9b1db1d 100644
--- a/test/unit/extract_cb_convenience_test.js
+++ b/test/unit/extract_cb_convenience_test.js
@@ -35,105 +35,6 @@ var serverMocks = require('../tools/serverMocks'),
     convenienceOperations;
 
 convenienceOperations = [
-    /* "Classic" NGSI9 operations */
-    ['GET', '/ngsi9/contextEntities/TestedEntityId001', 'discover'],
-    ['GET', '/ngsi9/contextEntities/type/TestedType01/id/TestedEntityId001', 'discover'],
-    ['POST', '/ngsi9/contextEntities/TestedEntityId001', 'register'],
-    ['POST', '/ngsi9/contextEntities/type/TestedType01/id/TestedEntityId001', 'register'],
-    ['GET', '/ngsi9/contextEntities/TestedEntityId001/attributes', 'N/A'],
-    ['GET', '/ngsi9/contextEntities/type/TestedType01/id/TestedEntityId001/attributes', 'N/A'],
-    ['POST', '/ngsi9/contextEntities/TestedEntityId001/attributes', 'N/A'],
-    ['POST', '/ngsi9/contextEntities/type/TestedType01/id/TestedEntityId001/attributes', 'N/A'],
-    ['GET', '/ngsi9/contextEntities/TestedEntityId001/attributes/TestedAttributeName001', 'discover'],
-    ['GET', '/ngsi9/contextEntities/type/TestedType01/id/TestedEntityId001/attributes/TestedAttributeName001',
-            'discover'],
-    ['POST', '/ngsi9/contextEntities/TestedEntityId001/attributes/TestedAttributeName001', 'register'],
-    ['POST', '/ngsi9/contextEntities/type/TestedType01/id/TestedEntityId001/attributes/TestedAttributeName001',
-            'register'],
-    ['GET', '/ngsi9/contextEntities/TestedEntityId001/attributeDomains/TestedDomainName001', 'discover'],
-    ['GET', '/ngsi9/contextEntities/type/TestedType01/id/TestedEntityId001/attributeDomains/TestedDomainName001',
-            'discover'],
-    ['POST', '/ngsi9/contextEntities/TestedEntityId001/attributeDomains/TestedDomainName001', 'register'],
-    ['POST', '/ngsi9/contextEntities/type/TestedType01/id/TestedEntityId001/attributeDomains/TestedDomainName001',
-            'register'],
-    ['GET', '/ngsi9/contextEntityTypes/TestedTypeName001', 'discover'],
-    ['POST', '/ngsi9/contextEntityTypes/TestedTypeName001', 'register'],
-    ['GET', '/ngsi9/contextEntityTypes/TestedTypeName001/attributes', 'N/A'],
-    ['POST', '/ngsi9/contextEntityTypes/TestedTypeName001/attributes', 'N/A'],
-    ['GET', '/ngsi9/contextEntityTypes/TestedTypeName001/attributes/TestedAttributeName001', 'discover'],
-    ['POST', '/ngsi9/contextEntityTypes/TestedTypeName001/attributes/TestedAttributeName001', 'register'],
-    ['GET', '/ngsi9/contextEntityTypes/TestedTypeName001/attributeDomains/TestedDomainName001', 'discover'],
-    ['POST', '/ngsi9/contextEntityTypes/TestedTypeName001/attributeDomains/TestedDomainName001', 'register'],
-
-    /* "Classic" NGSI10 operations */
-    ['GET', '/ngsi10/contextEntities/TestedEntityId002', 'read'],
-    ['GET', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002', 'read'],
-    ['PUT', '/ngsi10/contextEntities/TestedEntityId002', 'update'],
-    ['PUT', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002', 'update'],
-    ['POST', '/ngsi10/contextEntities/TestedEntityId002', 'create'],
-    ['POST', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002', 'create'],
-    ['DELETE', '/ngsi10/contextEntities/TestedEntityId002', 'delete'],
-    ['DELETE', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002', 'delete'],
-    ['GET', '/ngsi10/contextEntities/TestedEntityId002/attributes', 'N/A'],
-    ['GET', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002/attributes', 'N/A'],
-    ['PUT', '/ngsi10/contextEntities/TestedEntityId002/attributes', 'N/A'],
-    ['PUT', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002/attributes', 'N/A'],
-    ['POST', '/ngsi10/contextEntities/TestedEntityId002/attributes', 'N/A'],
-    ['POST', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002/attributes', 'N/A'],
-    ['DELETE', '/ngsi10/contextEntities/TestedEntityId002/attributes', 'N/A'],
-    ['DELETE', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002/attributes', 'N/A'],
-    ['GET', '/ngsi10/contextEntities/TestedEntityId002/attributes/TestedAttributeName001', 'read'],
-    ['GET', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002/attributes/TestedAttributeName001',
-            'read'],
-    ['POST', '/ngsi10/contextEntities/TestedEntityId002/attributes/TestedAttributeName001', 'create'],
-    ['POST', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002/attributes/TestedAttributeName001',
-            'create'],
-    ['PUT', '/ngsi10/contextEntities/TestedEntityId002/attributes/TestedAttributeName001', 'update'],
-    ['PUT', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002/attributes/TestedAttributeName001',
-            'update'],
-    ['DELETE', '/ngsi10/contextEntities/TestedEntityId002/attributes/TestedAttributeName001', 'delete'],
-    ['DELETE', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002/attributes/TestedAttributeName001',
-            'delete'],
-    ['GET', '/ngsi10/contextEntities/TestedEntityId002/attributes/TestedAttributeName001/TestedValueID001', 'read'],
-    ['GET', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002/attributes/TestedAttributeName001' +
-            '/TestedValueID001', 'read'],
-    ['PUT', '/ngsi10/contextEntities/TestedEntityId002/attributes/TestedAttributeName001/TestedValueID001', 'update'],
-    ['PUT', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002/attributes/TestedAttributeName001' +
-        '/TestedValueID001', 'update'],
-    ['DELETE', '/ngsi10/contextEntities/TestedEntityId002/attributes/TestedAttributeName001/TestedValueID001',
-        'delete'],
-    ['DELETE', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002/attributes/TestedAttributeName001' +
-        '/TestedValueID001', 'delete'],
-    ['GET', '/ngsi10/contextEntities/TestedEntityId002/attributeDomains/TestedDomainName001', 'read'],
-    ['GET', '/ngsi10/contextEntities/type/TestedType01/id/TestedEntityId002/attributeDomains/TestedDomainName001',
-            'read'],
-    ['GET', '/ngsi10/contextEntityTypes/TestedTypeName001', 'read'],
-    ['GET', '/v1/contextEntities/{EntityID}', 'read'],
-    ['GET', '/ngsi10/contextEntityTypes/TestedTypeName001/attributes', 'N/A'],
-    ['GET', '/ngsi10/contextEntityTypes/TestedTypeName001/attributes/TestedAttributeName001', 'read'],
-    ['GET', '/ngsi10/contextEntityTypes/TestedTypeName001/attributeDomains/TestedDomainName001', 'read'],
-    ['POST', '/ngsi10/contextSubscriptions', 'subscribe'],
-    ['PUT', '/ngsi10/contextSubscriptions/TestedSubscriptionID001', 'subscribe'],
-    ['DELETE', '/ngsi10/contextSubscriptions/TestedSubscriptionID001', 'subscribe'],
-
-    /* Testing a subset of "classic" operations in v1/ prefix (we don't need to be exahustive) */
-    ['PUT', '/v1/contextSubscriptions/TestedSubscriptionID001', 'subscribe'],
-    ['DELETE', '/v1/contextSubscriptions/TestedSubscriptionID001', 'subscribe'],
-    ['PUT', '/v1/contextSubscriptions/TestedSubscriptionID001', 'subscribe'],
-    ['GET', '/v1/registry/contextEntityTypes/TestedTypeName001', 'discover'],
-    ['POST', '/v1/registry/contextEntityTypes/TestedTypeName001', 'register'],
-
-    /* New operations in v1/ */
-    ['GET', '/v1/contextEntities', 'read'],
-    ['POST', '/v1/contextEntities', 'create'],
-    ['GET', '/v1/contextSubscriptions', 'read'],
-    ['GET', '/v1/contextSubscriptions/sub001', 'read'],
-    ['GET', '/v1/contextTypes', 'read'],
-    ['GET', '/v1/contextTypes/typeOfEntity001', 'read'],
-
-    /* NGSI Operations with query params */
-    ['GET', '/v1/contextSubscriptions?details=on&limit=15&offset=0', 'read'],
-
     /* V2 Operations */
     ['GET', '/v2', 'read'],
     ['GET', '/v2/entities', 'read'],