diff --git a/testkit/src/main/scala/org/bitcoins/testkit/wallet/BitcoinSWalletTestCachedBitcoind.scala b/testkit/src/main/scala/org/bitcoins/testkit/wallet/BitcoinSWalletTestCachedBitcoind.scala
index 1f00f3a6a0..6976c7ab6c 100644
--- a/testkit/src/main/scala/org/bitcoins/testkit/wallet/BitcoinSWalletTestCachedBitcoind.scala
+++ b/testkit/src/main/scala/org/bitcoins/testkit/wallet/BitcoinSWalletTestCachedBitcoind.scala
@@ -137,6 +137,18 @@ trait BitcoinSWalletTestCachedBitcoindNewest
     extends BitcoinSWalletTestCachedBitcoind
     with CachedBitcoindNewest {
 
+  override def withFixture(test: OneArgAsyncTest): FutureOutcome = {
+    val f: Future[Outcome] = for {
+      bitcoind <- cachedBitcoindWithFundsF
+      futOutcome = withFundedWalletAndBitcoindCached(
+        test,
+        getBIP39PasswordOpt(),
+        bitcoind)(getFreshWalletAppConfig)
+      fut <- futOutcome.toFuture
+    } yield fut
+    new FutureOutcome(f)
+  }
+
   override def afterAll(): Unit = {
     super[CachedBitcoindNewest].afterAll()
     super[BitcoinSWalletTestCachedBitcoind].afterAll()
diff --git a/wallet-test/src/test/scala/org/bitcoins/wallet/RescanHandlingTest.scala b/wallet-test/src/test/scala/org/bitcoins/wallet/RescanHandlingTest.scala
index 700629957a..b4f6688aa5 100644
--- a/wallet-test/src/test/scala/org/bitcoins/wallet/RescanHandlingTest.scala
+++ b/wallet-test/src/test/scala/org/bitcoins/wallet/RescanHandlingTest.scala
@@ -11,15 +11,15 @@ import org.bitcoins.core.wallet.utxo.TxoState
 import org.bitcoins.server.BitcoinSAppConfig
 import org.bitcoins.testkit.BitcoinSTestAppConfig
 import org.bitcoins.testkit.wallet.{
-  BitcoinSWalletTestCachedBitcoinV19,
+  BitcoinSWalletTestCachedBitcoindNewest,
   WalletWithBitcoind,
-  WalletWithBitcoindV19
+  WalletWithBitcoindRpc
 }
 
 import scala.concurrent.Future
 import scala.concurrent.duration.DurationInt
 
-class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoinV19 {
+class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoindNewest {
 
   /** Wallet config with data directory set to user temp directory */
   override protected def getFreshConfig: BitcoinSAppConfig =
@@ -78,7 +78,7 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoinV19 {
   val DEFAULT_ADDR_BATCH_SIZE = 10
   it must "be able to discover funds that belong to the wallet using WalletApi.rescanNeutrinoWallet" in {
     fixture: WalletWithBitcoind =>
-      val WalletWithBitcoindV19(wallet, _) = fixture
+      val WalletWithBitcoindRpc(wallet, _) = fixture
 
       val initBalanceF = wallet.getBalance()
 
@@ -98,7 +98,7 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoinV19 {
 
   it must "be able to discover funds that occurred within a certain range" in {
     fixture: WalletWithBitcoind =>
-      val WalletWithBitcoindV19(wallet, bitcoind) = fixture
+      val WalletWithBitcoindRpc(wallet, bitcoind) = fixture
 
       val amt = Bitcoins.one
       val numBlocks = 1
@@ -152,7 +152,7 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoinV19 {
 
   it must "be able to discover funds using multiple batches" in {
     fixture: WalletWithBitcoind =>
-      val WalletWithBitcoindV19(wallet, bitcoind) = fixture
+      val WalletWithBitcoindRpc(wallet, bitcoind) = fixture
 
       val amt = Bitcoins.one
       val numBlocks = 1
@@ -215,7 +215,7 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoinV19 {
 
   it must "be able to discover funds that occurred from the wallet creation time" in {
     fixture: WalletWithBitcoind =>
-      val WalletWithBitcoindV19(wallet, bitcoind) = fixture
+      val WalletWithBitcoindRpc(wallet, bitcoind) = fixture
 
       val amt = Bitcoins.one
       val numBlocks = 1
@@ -260,7 +260,7 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoinV19 {
 
   it must "NOT discover funds that happened OUTSIDE of a certain range of block hashes" in {
     fixture: WalletWithBitcoind =>
-      val WalletWithBitcoindV19(wallet, _) = fixture
+      val WalletWithBitcoindRpc(wallet, _) = fixture
 
       val initBalanceF = wallet.getBalance()
 
@@ -299,13 +299,13 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoinV19 {
 
   it must "acknowledge that a rescan is already in progress" in {
     fixture: WalletWithBitcoind =>
-      val WalletWithBitcoindV19(wallet, _) = fixture
+      val WalletWithBitcoindRpc(wallet, _) = fixture
       //do these in parallel on purpose to simulate multiple threads calling rescan
       val startF = wallet.rescanNeutrinoWallet(startOpt = None,
                                                endOpt = None,
                                                addressBatchSize =
                                                  DEFAULT_ADDR_BATCH_SIZE,
-                                               useCreationTime = false)
+                                               useCreationTime = true)
 
       //slight delay to make sure other rescan is started
       val alreadyStartedF =
@@ -314,7 +314,7 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoinV19 {
                                       endOpt = None,
                                       addressBatchSize =
                                         DEFAULT_ADDR_BATCH_SIZE,
-                                      useCreationTime = false)
+                                      useCreationTime = true)
         }
       for {
         start <- startF
@@ -328,7 +328,7 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoinV19 {
 
   it must "still receive payments to addresses generated pre-rescan" in {
     fixture: WalletWithBitcoind =>
-      val WalletWithBitcoindV19(wallet, bitcoind) = fixture
+      val WalletWithBitcoindRpc(wallet, bitcoind) = fixture
       val addressNoFundsF = wallet.getNewAddress()
 
       //start a rescan without sending payment to that address
@@ -337,7 +337,7 @@ class RescanHandlingTest extends BitcoinSWalletTestCachedBitcoinV19 {
         _ <- wallet.rescanNeutrinoWallet(startOpt = None,
                                          endOpt = None,
                                          addressBatchSize = 10,
-                                         useCreationTime = false)
+                                         useCreationTime = true)
 
         usedAddresses <- wallet.listFundedAddresses()