diff --git a/fdbserver/IndirectShadowPager.actor.cpp b/fdbserver/IndirectShadowPager.actor.cpp
index cb3f9a8d06..e90b6646c4 100644
--- a/fdbserver/IndirectShadowPager.actor.cpp
+++ b/fdbserver/IndirectShadowPager.actor.cpp
@@ -911,7 +911,7 @@ const PhysicalPageID PagerFile::INVALID_PAGE = std::numeric_limits<PhysicalPageI
 extern Future<Void> simplePagerTest(IPager* const& pager);
 
 TEST_CASE("fdbserver/indirectshadowpager/simple") {
-	state IPager *pager = new IndirectShadowPager("data/test");
+	state IPager *pager = new IndirectShadowPager("unittest_pageFile");
 
 	Void _ = wait(simplePagerTest(pager));
 
diff --git a/fdbserver/VersionedBTree.actor.cpp b/fdbserver/VersionedBTree.actor.cpp
index 04b3f82021..0545209865 100755
--- a/fdbserver/VersionedBTree.actor.cpp
+++ b/fdbserver/VersionedBTree.actor.cpp
@@ -1499,7 +1499,7 @@ public:
 		Void _ = wait(closedFuture);
 		self->m_closed.send(Void());
 		if(self->m_error.canBeSet()) {
-			self->m_error.sendError(operation_cancelled());
+			self->m_error.send(Never());
 		}
 		TraceEvent(SevInfo, "RedwoodShutdownComplete").detail("FilePrefix", self->m_filePrefix).detail("Dispose", dispose);
 		delete self;
@@ -1781,7 +1781,7 @@ ACTOR Future<int> verifyRandomRange(VersionedBTree *btree, Version v, std::map<s
 TEST_CASE("/redwood/correctness") {
 	state bool useDisk = true;
 
-	state std::string pagerFile = "testPager";
+	state std::string pagerFile = "unittest_pageFile";
 	state IPager *pager;
 	if(useDisk)
 		pager = new IndirectShadowPager(pagerFile);
@@ -1936,8 +1936,8 @@ TEST_CASE("/redwood/correctness") {
 }
 
 TEST_CASE("/redwood/performance/set") {
-	state IPager *pager = new IndirectShadowPager("pagerfile");
-	state VersionedBTree *btree = new VersionedBTree(pager, "pagerfile");
+	state IPager *pager = new IndirectShadowPager("unittest_pageFile");
+	state VersionedBTree *btree = new VersionedBTree(pager, "unittest_pageFile");
 	Void _ = wait(btree->init());
 
 	state int nodeCount = 100000;