diff --git a/tests/lipsum/nwProject.nwx b/tests/lipsum/nwProject.nwx
index 02e3df49..a8cf6393 100644
--- a/tests/lipsum/nwProject.nwx
+++ b/tests/lipsum/nwProject.nwx
@@ -16,6 +16,8 @@
     <autoOutline>True</autoOutline>
     <lastEdited>7a992350f3eb6</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastNovel>None</lastNovel>
+    <lastOutline>None</lastOutline>
     <lastWordCount>3847</lastWordCount>
     <novelWordCount>3109</novelWordCount>
     <notesWordCount>738</notesWordCount>
diff --git a/tests/minimal/nwProject.nwx b/tests/minimal/nwProject.nwx
index af7595a4..430ecf17 100644
--- a/tests/minimal/nwProject.nwx
+++ b/tests/minimal/nwProject.nwx
@@ -17,6 +17,8 @@
     <autoOutline>True</autoOutline>
     <lastEdited>None</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastNovel>None</lastNovel>
+    <lastOutline>None</lastOutline>
     <lastWordCount>10</lastWordCount>
     <novelWordCount>10</novelWordCount>
     <notesWordCount>0</notesWordCount>
diff --git a/tests/reference/coreProject_NewCustomA_nwProject.nwx b/tests/reference/coreProject_NewCustomA_nwProject.nwx
index be4845bf..f046fceb 100644
--- a/tests/reference/coreProject_NewCustomA_nwProject.nwx
+++ b/tests/reference/coreProject_NewCustomA_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-05-21 17:49:23">
+<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-06-12 17:45:51">
   <project>
     <name>Test Custom</name>
     <title>Test Novel</title>
@@ -17,6 +17,8 @@
     <autoOutline>True</autoOutline>
     <lastEdited>None</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastNovel>None</lastNovel>
+    <lastOutline>None</lastOutline>
     <lastWordCount>0</lastWordCount>
     <novelWordCount>0</novelWordCount>
     <notesWordCount>0</notesWordCount>
diff --git a/tests/reference/coreProject_NewCustomB_nwProject.nwx b/tests/reference/coreProject_NewCustomB_nwProject.nwx
index 12f911cd..5d02172c 100644
--- a/tests/reference/coreProject_NewCustomB_nwProject.nwx
+++ b/tests/reference/coreProject_NewCustomB_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-05-21 17:48:40">
+<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-06-12 17:45:51">
   <project>
     <name>Test Custom</name>
     <title>Test Novel</title>
@@ -17,6 +17,8 @@
     <autoOutline>True</autoOutline>
     <lastEdited>None</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastNovel>None</lastNovel>
+    <lastOutline>None</lastOutline>
     <lastWordCount>0</lastWordCount>
     <novelWordCount>0</novelWordCount>
     <notesWordCount>0</notesWordCount>
diff --git a/tests/reference/coreProject_NewFileFolder_nwProject.nwx b/tests/reference/coreProject_NewFileFolder_nwProject.nwx
index 4235e9bb..20aeb027 100644
--- a/tests/reference/coreProject_NewFileFolder_nwProject.nwx
+++ b/tests/reference/coreProject_NewFileFolder_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-06-06 21:17:27">
+<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-06-12 17:45:51">
   <project>
     <name>New Project</name>
     <title>New Novel</title>
@@ -16,6 +16,8 @@
     <autoOutline>True</autoOutline>
     <lastEdited>None</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastNovel>None</lastNovel>
+    <lastOutline>None</lastOutline>
     <lastWordCount>2</lastWordCount>
     <novelWordCount>1</novelWordCount>
     <notesWordCount>1</notesWordCount>
diff --git a/tests/reference/coreProject_NewMinimal_nwProject.nwx b/tests/reference/coreProject_NewMinimal_nwProject.nwx
index 422bb6b2..ba08600f 100644
--- a/tests/reference/coreProject_NewMinimal_nwProject.nwx
+++ b/tests/reference/coreProject_NewMinimal_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-05-21 17:50:26">
+<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-06-12 17:45:51">
   <project>
     <name>New Project</name>
     <title></title>
@@ -15,6 +15,8 @@
     <autoOutline>True</autoOutline>
     <lastEdited>None</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastNovel>None</lastNovel>
+    <lastOutline>None</lastOutline>
     <lastWordCount>0</lastWordCount>
     <novelWordCount>0</novelWordCount>
     <notesWordCount>0</notesWordCount>
diff --git a/tests/reference/coreProject_NewRoot_nwProject.nwx b/tests/reference/coreProject_NewRoot_nwProject.nwx
index cd25c1cf..0a606137 100644
--- a/tests/reference/coreProject_NewRoot_nwProject.nwx
+++ b/tests/reference/coreProject_NewRoot_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-05-21 22:07:28">
+<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-06-12 17:45:51">
   <project>
     <name>New Project</name>
     <title>New Novel</title>
@@ -16,6 +16,8 @@
     <autoOutline>True</autoOutline>
     <lastEdited>None</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastNovel>None</lastNovel>
+    <lastOutline>None</lastOutline>
     <lastWordCount>0</lastWordCount>
     <novelWordCount>0</novelWordCount>
     <notesWordCount>0</notesWordCount>
diff --git a/tests/reference/guiEditor_Main_Final_nwProject.nwx b/tests/reference/guiEditor_Main_Final_nwProject.nwx
index a47d454d..ecc96604 100644
--- a/tests/reference/guiEditor_Main_Final_nwProject.nwx
+++ b/tests/reference/guiEditor_Main_Final_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-05-21 17:27:16">
+<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-06-12 17:52:44">
   <project>
     <name>New Project</name>
     <title>New Novel</title>
@@ -16,6 +16,8 @@
     <autoOutline>True</autoOutline>
     <lastEdited>000000000000f</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastNovel>0000000000008</lastNovel>
+    <lastOutline>None</lastOutline>
     <lastWordCount>129</lastWordCount>
     <novelWordCount>102</novelWordCount>
     <notesWordCount>27</notesWordCount>
diff --git a/tests/reference/guiEditor_Main_Initial_nwProject.nwx b/tests/reference/guiEditor_Main_Initial_nwProject.nwx
index 03313570..1a79d2c2 100644
--- a/tests/reference/guiEditor_Main_Initial_nwProject.nwx
+++ b/tests/reference/guiEditor_Main_Initial_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-05-21 17:25:41">
+<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-06-12 17:45:57">
   <project>
     <name>New Project</name>
     <title>New Novel</title>
@@ -16,6 +16,8 @@
     <autoOutline>True</autoOutline>
     <lastEdited>None</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastNovel>None</lastNovel>
+    <lastOutline>None</lastOutline>
     <lastWordCount>9</lastWordCount>
     <novelWordCount>9</novelWordCount>
     <notesWordCount>0</notesWordCount>
diff --git a/tests/reference/guiProjSettings_Dialog_nwProject.nwx b/tests/reference/guiProjSettings_Dialog_nwProject.nwx
index f12c1dc2..883cb26d 100644
--- a/tests/reference/guiProjSettings_Dialog_nwProject.nwx
+++ b/tests/reference/guiProjSettings_Dialog_nwProject.nwx
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-05-21 17:31:17">
+<novelWriterXML appVersion="1.7-beta1" hexVersion="0x010700b1" fileVersion="1.4" timeStamp="2022-06-12 17:45:53">
   <project>
     <name>Project Name</name>
     <title>Project Title</title>
@@ -17,6 +17,8 @@
     <autoOutline>True</autoOutline>
     <lastEdited>None</lastEdited>
     <lastViewed>None</lastViewed>
+    <lastNovel>None</lastNovel>
+    <lastOutline>None</lastOutline>
     <lastWordCount>9</lastWordCount>
     <novelWordCount>9</novelWordCount>
     <notesWordCount>0</notesWordCount>
diff --git a/tests/test_gui/test_gui_guimain.py b/tests/test_gui/test_gui_guimain.py
index 9a56af3d..b197885e 100644
--- a/tests/test_gui/test_gui_guimain.py
+++ b/tests/test_gui/test_gui_guimain.py
@@ -132,7 +132,7 @@ def testGuiMain_ProjectTreeItems(qtbot, monkeypatch, nwGUI, fncProj, mockRnd):
 
     # Novel Tree has focus
     nwGUI.projStack.setCurrentIndex(1)
-    nwGUI.novelView.refreshTree(True)
+    nwGUI.novelView.refreshTree(rootHandle=None, overRide=True)
     with monkeypatch.context() as mp:
         mp.setattr(GuiNovelView, "treeFocus", lambda *a: True)
         assert nwGUI.docEditor.docHandle() is None
diff --git a/tests/test_gui/test_gui_noveltree.py b/tests/test_gui/test_gui_noveltree.py
index 644839d3..b1e223cf 100644
--- a/tests/test_gui/test_gui_noveltree.py
+++ b/tests/test_gui/test_gui_noveltree.py
@@ -62,7 +62,7 @@ def testGuiNovelTree_TreeItems(qtbot, monkeypatch, nwGUI, nwMinimal):
 
     nwGUI.projStack.setCurrentIndex(nwGUI.idxNovelView)
     nwGUI.rebuildIndex()
-    novelTree._populateTree()
+    novelTree._populateTree(rootHandle=None)
     assert novelTree.topLevelItemCount() == 1
 
     # Rebuild should preserve selection
@@ -133,7 +133,7 @@ def testGuiNovelTree_TreeItems(qtbot, monkeypatch, nwGUI, nwMinimal):
         "#### Section\n\n"
     ))
     nwGUI.rebuildIndex()
-    novelTree._populateTree()
+    novelTree._populateTree(None)
     assert novelTree.topLevelItem(0).text(novelTree.C_TITLE) == "Section wo/Scene"
     assert novelTree.topLevelItem(1).text(novelTree.C_TITLE) == "Scene wo/Chapter"
     assert novelTree.topLevelItem(2).text(novelTree.C_TITLE) == "Chapter wo/Title"