diff --git a/data/tests/FTM_16dec2015a-mod1.gramps b/data/tests/FTM_16dec2015a-mod1.gramps
index 88fdc096a..2edc28c6b 100644
Binary files a/data/tests/FTM_16dec2015a-mod1.gramps and b/data/tests/FTM_16dec2015a-mod1.gramps differ
diff --git a/data/tests/MixInlineXrefNote.gramps b/data/tests/MixInlineXrefNote.gramps
index b1367cbd1..57e91ac0e 100644
Binary files a/data/tests/MixInlineXrefNote.gramps and b/data/tests/MixInlineXrefNote.gramps differ
diff --git a/data/tests/Paris.gramps b/data/tests/Paris.gramps
index 1b780e15e..e32f43b44 100644
Binary files a/data/tests/Paris.gramps and b/data/tests/Paris.gramps differ
diff --git a/data/tests/bug 8322 test.gramps b/data/tests/bug 8322 test.gramps
index a8219e5d1..8be3cf23c 100644
Binary files a/data/tests/bug 8322 test.gramps and b/data/tests/bug 8322 test.gramps differ
diff --git a/data/tests/sample.gramps b/data/tests/sample.gramps
index d585fdb3b..e338b9100 100644
Binary files a/data/tests/sample.gramps and b/data/tests/sample.gramps differ
diff --git a/data/tests/test_FTM_CONC.gramps b/data/tests/test_FTM_CONC.gramps
index 98d329aa0..564030f73 100644
Binary files a/data/tests/test_FTM_CONC.gramps and b/data/tests/test_FTM_CONC.gramps differ
diff --git a/data/tests/vcard.gramps b/data/tests/vcard.gramps
index 04ec7a637..1216c48b4 100644
Binary files a/data/tests/vcard.gramps and b/data/tests/vcard.gramps differ
diff --git a/gramps/gen/utils/id.py b/gramps/gen/utils/id.py
index d6587fbf5..63a0436d9 100644
--- a/gramps/gen/utils/id.py
+++ b/gramps/gen/utils/id.py
@@ -52,7 +52,7 @@ _det_id = False
 
 def create_id():
     global _rand
-    if _det_id is True:
+    if _det_id:
         _rand = _rand + 1
         return "%08x%08x" % (_rand, _rand)
     else:
diff --git a/gramps/plugins/test/test_imports.py b/gramps/plugins/test/test_imports.py
index 84045603a..1d51ea5c1 100644
--- a/gramps/plugins/test/test_imports.py
+++ b/gramps/plugins/test/test_imports.py
@@ -1,5 +1,6 @@
 #! /usr/bin/env python3
-""" Test program for import modules """
+""" Test program for import modules
+"""
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
@@ -44,11 +45,13 @@ TEST_DIR = os.path.abspath(os.path.join(DATA_DIR, "tests"))
 
 class CompleteCheck(unittest.TestCase):
     """The test class cases will be dynamically created at import time from
-    files to be tested.  The following defs are used by the test cases"""
+    files to be tested.  The following defs are used by the test cases
+    """
 
     def prepare_result(self, diffs, added, missing):
         """ Looks through the diffs, added, and missing items and begins
-        reporting process.  Returns True if there were significant errors. """
+        reporting process.  Returns True if there were significant errors.
+        """
         # pylint: disable=E1101
         # pylint does not like dynamically created methods
         deltas = False
@@ -113,7 +116,8 @@ class CompleteCheck(unittest.TestCase):
 
 def _report_details(path, diff1, diff2):
     """ Checks if a detail is significant, needs adjusting for xml filter
-    effects, and returns a string describing the specific difference."""
+    effects, and returns a string describing the specific difference.
+    """
     if isinstance(diff1, bool):
         desc1 = repr(diff1)
     else:
@@ -148,7 +152,8 @@ def _report_details(path, diff1, diff2):
 
 
 def _format_struct_path(path):
-    """ prepares a 'path' string for the report out of the structure. """
+    """ prepares a 'path' string for the report out of the structure.
+    """
     retval = ""
     parts = path.split(".")
     for part in parts:
@@ -164,10 +169,12 @@ def _format_struct_path(path):
 
 def make_tst_function(tstfile, file_name):
     """ This is here to support the dynamic function creation.  This creates
-    the test function (a method, to be precise). """
+    the test function (a method, to be precise).
+    """
     def tst(self):
         """ This compares the import file with the expected result '.gramps'
-        file. """
+        file.
+        """
         self.user = User(quiet=True)
         fn1 = os.path.join(TEST_DIR, tstfile)
         fn2 = os.path.join(TEST_DIR, (file_name + ".gramps"))