diff -r 51c160677afe -r 39cf9e55ada8 cubicweb/test/unittest_schema.py
--- a/cubicweb/test/unittest_schema.py	Wed Oct 05 15:30:10 2016 +0200
+++ b/cubicweb/test/unittest_schema.py	Thu Oct 06 12:11:23 2016 +0200
@@ -175,7 +175,7 @@
             'CWConstraintType', 'CWDataImport', 'CWEType',
             'CWAttribute', 'CWGroup', 'EmailAddress',
             'CWRelation', 'CWPermission', 'CWProperty', 'CWRType', 'CWSession',
-            'CWSource', 'CWSourceHostConfig', 'CWSourceSchemaConfig',
+            'CWSource', 'CWSourceHostConfig',
             'CWUniqueTogetherConstraint', 'CWUser',
             'ExternalUri', 'FakeFile', 'Float', 'Int', 'Interval', 'Note',
             'Password', 'Personne', 'Produit',
@@ -196,8 +196,7 @@
             'constrained_by', 'constraint_of',
             'content', 'content_format', 'contrat_exclusif',
             'created_by', 'creation_date', 'cstrtype', 'custom_workflow',
-            'cwuri', 'cwsessiondata', 'cw_for_source', 'cw_import_of', 'cw_host_config_of',
-            'cw_schema', 'cw_source',
+            'cwuri', 'cwsessiondata', 'cw_import_of', 'cw_host_config_of', 'cw_source',
 
             'data', 'data_encoding', 'data_format', 'data_name', 'default_workflow', 'defaultval',
             'delete_permission', 'description', 'description_format', 'destination_state',
@@ -219,7 +218,7 @@
 
             'name', 'nom',
 
-            'options', 'ordernum', 'owned_by',
+            'ordernum', 'owned_by',
 
             'parser', 'path', 'pkey', 'prefered_form', 'prenom', 'primary_email',
 
@@ -492,7 +491,6 @@
                         ('update_permission', 'CWAttribute', 'RQLExpression', 'subject')],
         'CWEType': [('add_permission', 'CWEType', 'RQLExpression', 'subject'),
                     ('constraint_of', 'CWUniqueTogetherConstraint', 'CWEType', 'object'),
-                    ('cw_schema', 'CWSourceSchemaConfig', 'CWEType', 'object'),
                     ('delete_permission', 'CWEType', 'RQLExpression', 'subject'),
                     ('from_entity', 'CWAttribute', 'CWEType', 'object'),
                     ('from_entity', 'CWRelation', 'CWEType', 'object'),
@@ -500,17 +498,14 @@
                     ('to_entity', 'CWAttribute', 'CWEType', 'object'),
                     ('to_entity', 'CWRelation', 'CWEType', 'object'),
                     ('update_permission', 'CWEType', 'RQLExpression', 'subject')],
-        'CWRType': [('cw_schema', 'CWSourceSchemaConfig', 'CWRType', 'object'),
-                    ('relation_type', 'CWAttribute', 'CWRType', 'object'),
+        'CWRType': [('relation_type', 'CWAttribute', 'CWRType', 'object'),
                     ('relation_type', 'CWRelation', 'CWRType', 'object')],
         'CWRelation': [('add_permission', 'CWRelation', 'RQLExpression', 'subject'),
                        ('constrained_by', 'CWRelation', 'CWConstraint', 'subject'),
-                       ('cw_schema', 'CWSourceSchemaConfig', 'CWRelation', 'object'),
                        ('delete_permission', 'CWRelation', 'RQLExpression', 'subject'),
                        ('read_permission', 'CWRelation', 'RQLExpression', 'subject')],
         'CWComputedRType': [('read_permission', 'CWComputedRType', 'RQLExpression', 'subject')],
-        'CWSource': [('cw_for_source', 'CWSourceSchemaConfig', 'CWSource', 'object'),
-                     ('cw_host_config_of', 'CWSourceHostConfig', 'CWSource', 'object'),
+        'CWSource': [('cw_host_config_of', 'CWSourceHostConfig', 'CWSource', 'object'),
                      ('cw_import_of', 'CWDataImport', 'CWSource', 'object'),
                      ('cw_source', 'Ami', 'CWSource', 'object'),
                      ('cw_source', 'BaseTransition', 'CWSource', 'object'),
@@ -530,7 +525,6 @@
                      ('cw_source', 'CWSession', 'CWSource', 'object'),
                      ('cw_source', 'CWSource', 'CWSource', 'object'),
                      ('cw_source', 'CWSourceHostConfig', 'CWSource', 'object'),
-                     ('cw_source', 'CWSourceSchemaConfig', 'CWSource', 'object'),
                      ('cw_source', 'CWUniqueTogetherConstraint', 'CWSource', 'object'),
                      ('cw_source', 'CWUser', 'CWSource', 'object'),
                      ('cw_source', 'Card', 'CWSource', 'object'),