diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 419d4011b..d2d6ea50e 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -4,8 +4,8 @@ on:
   workflow_call:
 
 env:
-  stack-orchestrator-ref: ${{ github.event.inputs.stack-orchestrator-ref  || 'feature/geth-testing'}}
-  ipld-eth-db-ref: ${{ github.event.inputs.ipld-ethcl-db-ref  || 'feature/startup-script' }}
+  stack-orchestrator-ref: ${{ github.event.inputs.stack-orchestrator-ref  || '382aca8e42bc5e33f301f77cdd2e09cc80602fc3'}}
+  ipld-eth-db-ref: ${{ github.event.inputs.ipld-ethcl-db-ref  || '48eb594ea95763bda8e51590f105f7a2657ac6d4' }}
   GOPATH: /tmp/go
 
 jobs:
@@ -70,15 +70,13 @@ jobs:
       - name: Create config file
         run: |
           echo vulcanize_ipld_eth_db=$GITHUB_WORKSPACE/ipld-eth-db/ > $GITHUB_WORKSPACE/config.sh
-          echo vulcanize_go_ethereum=$GITHUB_WORKSPACE/go-ethereum/ >> $GITHUB_WORKSPACE/config.sh
           echo db_write=true >> $GITHUB_WORKSPACE/config.sh
           cat $GITHUB_WORKSPACE/config.sh
 
       - name: Run docker compose
         run: |
           docker-compose  \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-migration.yml" \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/latest/docker-compose-timescale-db.yml" \
+          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" \
           --env-file $GITHUB_WORKSPACE/config.sh \
           up -d --build
 
@@ -135,9 +133,8 @@ jobs:
       - name: Run docker compose
         run: |
           docker-compose  \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-migration.yml" \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum4.yml" \
-          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/latest/docker-compose-timescale-db.yml" \
+          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" \
+          -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-db-sharding.yml" \
           --env-file $GITHUB_WORKSPACE/config.sh \
           up -d --build
 
@@ -160,7 +157,7 @@ jobs:
       - name: Make sure we see entries in the header table
         shell: bash
         run: |
-          rows=$(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec access-node psql -U vdbm -d vulcanize_testing_v4  -AXqtc "SELECT COUNT(*) FROM eth.header_cids")
+          rows=$(docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d vulcanize_testing  -AXqtc "SELECT COUNT(*) FROM eth.header_cids")
           [[ "$rows" -lt "1" ]] && echo "We could not find any rows in postgres table." && (exit 1)
           echo $rows
-          docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec access-node psql -U vdbm -d vulcanize_testing_v4  -AXqtc "SELECT * FROM eth.header_cids"
+          docker compose -f "$GITHUB_WORKSPACE/stack-orchestrator/docker/local/docker-compose-go-ethereum.yml" exec ipld-eth-db psql -U vdbm -d vulcanize_testing  -AXqtc "SELECT * FROM eth.header_cids"
diff --git a/statediff/indexer/database/sql/postgres/config.go b/statediff/indexer/database/sql/postgres/config.go
index 29b663458..27f78f8f4 100644
--- a/statediff/indexer/database/sql/postgres/config.go
+++ b/statediff/indexer/database/sql/postgres/config.go
@@ -48,8 +48,8 @@ func ResolveDriverType(str string) (DriverType, error) {
 // DefaultConfig are default parameters for connecting to a Postgres sql
 var DefaultConfig = Config{
 	Hostname:     "localhost",
-	Port:         8066,
-	DatabaseName: "vulcanize_testing_v4",
+	Port:         8077,
+	DatabaseName: "vulcanize_testing",
 	Username:     "vdbm",
 	Password:     "password",
 }
diff --git a/statediff/indexer/ipld/shared.go b/statediff/indexer/ipld/shared.go
index e5c22a3c6..8dd68916f 100644
--- a/statediff/indexer/ipld/shared.go
+++ b/statediff/indexer/ipld/shared.go
@@ -106,7 +106,7 @@ func newLocalTrie() *localTrie {
 	lt := &localTrie{}
 	lt.db = rawdb.NewMemoryDatabase()
 	lt.trieDB = trie.NewDatabase(lt.db)
-	lt.trie, err = trie.New(common.Hash{}, lt.trieDB)
+	lt.trie, err = trie.New(common.Hash{}, common.Hash{}, lt.trieDB)
 	if err != nil {
 		panic(err)
 	}
diff --git a/statediff/test_helpers/mocks/backend.go b/statediff/test_helpers/mocks/backend.go
index 24b328882..1ab5b8b27 100644
--- a/statediff/test_helpers/mocks/backend.go
+++ b/statediff/test_helpers/mocks/backend.go
@@ -251,3 +251,7 @@ func (backend *Backend) ChainConfig() *params.ChainConfig {
 func (backend *Backend) Engine() consensus.Engine {
 	panic("not implemented") // TODO: Implement
 }
+
+func (backend *Backend) PendingBlockAndReceipts() (*types.Block, types.Receipts) {
+	return nil, nil
+}