diff --git a/relation_migrate/relation_migrate.destination.inc b/relation_migrate/relation_migrate.destination.inc
index f4b1570..196babf 100644
--- a/relation_migrate/relation_migrate.destination.inc
+++ b/relation_migrate/relation_migrate.destination.inc
@@ -14,7 +14,6 @@ class MigrateDestinationRelation extends MigrateDestinationEntity {
       'rid' => array(
         'type' => 'int',
         'unsigned' => TRUE,
-        'not null' => TRUE,
         'description' => 'Unique relation id (entity id).',
       ),
     );
@@ -24,9 +23,9 @@ class MigrateDestinationRelation extends MigrateDestinationEntity {
    * Basic initialization
    *
    * @param string $bundle
-   *  A.k.a. the content type (page, article, etc.) of the node.
+   *  A.k.a. the relation type.
    * @param array $options
-   *  Options applied to nodes.
+   *  Options applied to relations.
    */
   public function __construct($bundle, array $options = array()) {
     parent::__construct('relation', $bundle, $options);
@@ -48,6 +47,9 @@ class MigrateDestinationRelation extends MigrateDestinationEntity {
     $fields['created'] = t('Relation: Created timestamp');
     $fields['changed'] = t('Relation: Modified timestamp');
 
+    $fields['entity_id_source'] = t('Relation: Entity ID Source');
+    $fields['entity_id_destination'] = t('Relation: Entity ID Destination');
+
     // Then add in anything provided by handlers
     $fields += migrate_handler_invoke_all('Entity', 'fields', $this->entityType, $this->bundle);
     $fields += migrate_handler_invoke_all('Relation', 'fields', $this->entityType, $this->bundle);
diff --git a/relation_migrate/relation_migrate.info b/relation_migrate/relation_migrate.info
index ea7578e..322d351 100644
--- a/relation_migrate/relation_migrate.info
+++ b/relation_migrate/relation_migrate.info
@@ -6,8 +6,7 @@ package = Relation
 files[] = relation_migrate.destination.inc
 files[] = relation_migrate.source.inc
 files[] = relation_migrate.migration.inc
-; @see https://www.drupal.org/node/2397171
-;files[] = tests/relation.migrate.test
+files[] = tests/relation.migrate.test
 
 dependencies[] = relation
 dependencies[] = relation_ui