diff --git a/src/main/java/org/qortal/crosschain/BTC.java b/src/main/java/org/qortal/crosschain/BTC.java
index 77d24cad..ec53eb08 100644
--- a/src/main/java/org/qortal/crosschain/BTC.java
+++ b/src/main/java/org/qortal/crosschain/BTC.java
@@ -95,7 +95,7 @@ public class BTC {
 			return null;
 
 		// Grab latest 11 blocks
-		List<byte[]> blockHeaders = this.electrumX.getBlockHeaders(height, 11);
+		List<byte[]> blockHeaders = this.electrumX.getBlockHeaders(height - 11, 11);
 		if (blockHeaders == null || blockHeaders.size() < 11)
 			return null;
 
diff --git a/src/test/java/org/qortal/test/btcacct/BtcTests.java b/src/test/java/org/qortal/test/btcacct/BtcTests.java
index 4f3f5bd1..d0530c47 100644
--- a/src/test/java/org/qortal/test/btcacct/BtcTests.java
+++ b/src/test/java/org/qortal/test/btcacct/BtcTests.java
@@ -4,10 +4,6 @@ import static org.junit.Assert.*;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
 
 import org.bitcoinj.store.BlockStoreException;
 import org.junit.After;
@@ -30,36 +26,6 @@ public class BtcTests extends Common {
 		BTC.resetForTesting();
 	}
 
-	@Test
-	public void testStartupShutdownTestNet3() {
-		BTC btc = BTC.getInstance();
-
-		ExecutorService executor = Executors.newSingleThreadExecutor();
-		Future<Integer> future = executor.submit(() -> btc.getMedianBlockTime());
-
-		try {
-			Integer medianBlockTime = future.get();
-			assertNull("Shutdown should occur before we get a result", medianBlockTime);
-		} catch (InterruptedException | ExecutionException e) {
-		}
-	}
-
-	@Test
-	public void testStartupShutdownRegTest() throws DataException {
-		Common.useSettings("test-settings-v2-bitcoin-regtest.json");
-
-		BTC btc = BTC.getInstance();
-
-		ExecutorService executor = Executors.newSingleThreadExecutor();
-		Future<Integer> future = executor.submit(() -> btc.getMedianBlockTime());
-
-		try {
-			Integer medianBlockTime = future.get();
-			assertNull("Shutdown should occur before we get a result", medianBlockTime);
-		} catch (InterruptedException | ExecutionException e) {
-		}
-	}
-
 	@Test
 	public void testGetMedianBlockTime() throws BlockStoreException {
 		System.out.println(String.format("Starting BTC instance..."));