diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index e4716d7..9975879 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -5,53 +5,55 @@ on:
   push:
     branches:
       - main
+      - master
       - develop
   pull_request:
-    branches:
-      - main
-      - develop
 
 jobs:
-  job_build_debug:
-    name: Build debug
-    runs-on: ubuntu-latest
+  job_build_release_plugin:
+    name: Build release plugin
+    strategy:
+      matrix:
+        include:
+          - sdk: "$NANOS_SDK"
+            name: "nanos"
+          - sdk: "$NANOX_SDK"
+            name: "nanox"
+          - sdk: "$NANOSP_SDK"
+            name: "nanosp"
 
+    runs-on: ubuntu-latest
     container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
 
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
-      - name: Build Ledger NFT plugin
+      - name: Build
         run: |
-          make DEBUG=1
-
-      - name: Upload Ledger NFT binary
-        uses: actions/upload-artifact@v2
-        with:
-          name: ledger-nft-app-debug
-          path: bin
+          make BOLOS_SDK=${{ matrix.sdk }} -j
 
   job_scan_build:
     name: Clang Static Analyzer
-    needs: job_build_debug
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: Build with Clang Static Analyzer
         run: |
-          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
-          make clean
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
           scan-build --use-cc=clang -analyze-headers -enable-checker security -enable-checker unix -enable-checker valist -o scan-build --status-bugs make default
-      - uses: actions/upload-artifact@v2
+
+      - uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: scan-build
@@ -59,20 +61,21 @@ jobs:
 
   job_coverity_scan:
     name: Coverity Scan
-    needs: job_build_debug
     runs-on: ubuntu-latest
 
     container:
       image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-scanner:latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
 
       - name: Build with cov-build
         run: |
-          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
-          make clean
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
           cov-build --dir cov-int make default
+
       - name: Submit the result to Coverity Scan
         run: |
           tar czvf cov-int.tar.gz cov-int
@@ -86,195 +89,88 @@ jobs:
         env:
           EMAIL: ${{ secrets.COVERITY_SCAN_EMAIL }}
           TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
-  job_build_debug_nano_s:
-    name: Build debug Nano S
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
-    steps:
-      - name: Clone
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Clone SDK
-        uses: actions/checkout@v3
-        with:
-          repository: LedgerHQ/ethereum-plugin-sdk
-          path: ethereum-plugin-sdk
-          ref: develop
-      - name: Build plugin for Nano S
-        run: |
-          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
-          make clean
-          make BOLOS_SDK=$NANOS_SDK
-      - name: Move binary to test directory
-        run: |
-          mkdir -p ./tests/elfs/
-          mv bin/app.elf ./tests/elfs/ledger_nft_nanos.elf
-      - name: Upload plugin binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: binaries
-          path: tests/elfs/ledger_nft_nanos.elf
 
-  job_build_debug_nano_sp:
-    name: Build debug Nano S+
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
-    steps:
-      - name: Clone
-        uses: actions/checkout@v3
-        with:
-          submodules: recursive
-      - name: Clone SDK
-        uses: actions/checkout@v3
-        with:
-          repository: LedgerHQ/ethereum-plugin-sdk
-          path: ethereum-plugin-sdk
-          ref: develop
-      - name: Build plugin for Nano S+
-        run: |
-          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
-          make clean
-          make BOLOS_SDK=$NANOSP_SDK
-      - name: Move binary to test directory
-        run: |
-          mkdir -p ./tests/elfs/
-          mv bin/app.elf ./tests/elfs/ledger_nft_nanosp.elf
-      - name: Upload plugin binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: binaries
-          path: tests/elfs/ledger_nft_nanosp.elf
+  job_build_debug_plugin:
+    name: Build debug plugin
+    strategy:
+      matrix:
+        include:
+          - sdk: "$NANOS_SDK"
+            name: "nanos"
+          - sdk: "$NANOX_SDK"
+            name: "nanox"
+          - sdk: "$NANOSP_SDK"
+            name: "nanosp"
 
-  job_build_debug_nano_x:
-    name: Build debug Nano X
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
+
     steps:
       - name: Clone
         uses: actions/checkout@v3
         with:
           submodules: recursive
-      - name: Clone SDK
-        uses: actions/checkout@v3
-        with:
-          repository: LedgerHQ/ethereum-plugin-sdk
-          path: ethereum-plugin-sdk
-          ref: develop
-      - name: Build plugin for Nano X
-        run: |
-          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
-          make clean
-          make BOLOS_SDK=$NANOX_SDK
-      - name: Move binary to test directory
-        run: |
-          mkdir -p ./tests/elfs/
-          mv bin/app.elf ./tests/elfs/ledger_nft_nanox.elf
-      - name: Upload plugin binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: binaries
-          path: tests/elfs/ledger_nft_nanox.elf
 
-  job_build_ethereum_nano_s:
-    name: Build Ethereum application for Nano S testing
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
-    steps:
-      - name: Checkout app-ethereum
-        uses: actions/checkout@v3
-        with:
-          repository: LedgerHQ/app-ethereum
-          ref: develop
-          submodules: recursive
-      - name: Build ethereum
+      - name: Build
         run: |
-          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
           make clean
-          make -j DEBUG=1 BYPASS_SIGNATURES=1 BOLOS_SDK=$NANOS_SDK CHAIN=ethereum ALLOW_DATA=1
-      - name: Move binary to test directory
-        run: |
-          mkdir -p ./tests/elfs/
-          mv bin/app.elf ./tests/elfs/ethereum_nanos.elf
-      - name: Upload plugin binary
-        uses: actions/upload-artifact@v3
-        with:
-          name: binaries
-          path: tests/elfs/ethereum_nanos.elf
+          make -j DEBUG=1 BOLOS_SDK=${{ matrix.sdk }}
 
-  job_build_ethereum_nano_sp:
-    name: Build Ethereum application for Nano S+ testing
-    runs-on: ubuntu-latest
-    container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
-    steps:
-      - name: Checkout app-ethereum
-        uses: actions/checkout@v3
-        with:
-          repository: LedgerHQ/app-ethereum
-          ref: develop
-          submodules: recursive
-      - name: Build ethereum
-        run: |
-          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
-          make clean
-          make -j DEBUG=1 BYPASS_SIGNATURES=1 BOLOS_SDK=$NANOSP_SDK CHAIN=ethereum ALLOW_DATA=1
-      - name: Move binary to test directory
+      - name: Rename binary
         run: |
-          mkdir -p ./tests/elfs/
-          mv bin/app.elf ./tests/elfs/ethereum_nanosp.elf
-      - name: Upload plugin binary
+          mv bin/app.elf plugin_${{ matrix.name }}.elf
+
+      - name: Upload binary
         uses: actions/upload-artifact@v3
         with:
           name: binaries
-          path: tests/elfs/ethereum_nanosp.elf
+          path: plugin_${{ matrix.name }}.elf
+
+  job_build_debug_app:
+    name: Build debug Ethereum app
+    strategy:
+      matrix:
+        include:
+          - sdk: "$NANOS_SDK"
+            name: "nanos"
+          - sdk: "$NANOX_SDK"
+            name: "nanox"
+          - sdk: "$NANOSP_SDK"
+            name: "nanosp"
 
-  job_build_ethereum_nano_x:
-    name: Build Ethereum application for Nano X testing
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-lite:latest
+
     steps:
       - name: Checkout app-ethereum
         uses: actions/checkout@v3
         with:
           repository: LedgerHQ/app-ethereum
-          ref: develop
+          ref: ${{ ((github.base_ref || github.ref_name) == 'main' && 'master') || (github.base_ref || github.ref_name) }}
           submodules: recursive
-      - name: Build ethereum
+
+      - name: Build
         run: |
-          git config --global --add safe.directory /__w/LedgerHQ-app-plugin-nft/LedgerHQ-app-plugin-nft
           make clean
-          make -j DEBUG=1 BYPASS_SIGNATURES=1 BOLOS_SDK=$NANOX_SDK CHAIN=ethereum ALLOW_DATA=1
-      - name: Move binary to test directory
+          make -j DEBUG=1 BYPASS_SIGNATURES=1 BOLOS_SDK=${{ matrix.sdk }} CHAIN=ethereum ALLOW_DATA=1
+
+      - name: Rename binary
         run: |
-          mkdir -p ./tests/elfs/
-          mv bin/app.elf ./tests/elfs/ethereum_nanox.elf
-      - name: Upload plugin binary
+          mv bin/app.elf ethereum_${{ matrix.name }}.elf
+
+      - name: Upload binary
         uses: actions/upload-artifact@v3
         with:
           name: binaries
-          path: tests/elfs/ethereum_nanox.elf
+          path: ethereum_${{ matrix.name }}.elf
 
   jobs-e2e-tests:
-    needs:
-      - job_build_debug_nano_s
-      - job_build_debug_nano_sp
-      - job_build_debug_nano_x
-      - job_build_ethereum_nano_s
-      - job_build_ethereum_nano_sp
-      - job_build_ethereum_nano_x
+    name: E2E Tests
+    needs: [job_build_debug_plugin, job_build_debug_app]
     runs-on: ubuntu-latest
     steps:
-      - name: Test
-        run: |
-          id
-          echo $HOME
-          echo $DISPLAY
       - name: Checkout
         uses: actions/checkout@v3
       - name: Download built binaries
@@ -282,19 +178,20 @@ jobs:
         with:
           name: binaries
           path: tests/elfs/
-      - name: Check downloaded binaries
-        run: ls -lh ./tests/elfs
-      - run: sudo apt-get update -y && sudo apt-get install -y libusb-1.0.0 libudev-dev
+
       - name: Install node
         uses: actions/setup-node@v3
         with:
-          node-version: "14.18.1"
+          node-version: "16.19.0"
+
       - name: Install yarn
         run: |
           npm install -g yarn
-      - name: Build/Install build js deps
+
+      - name: Install JS deps
         run: |
           cd tests && yarn install
-      - name: Run zemu tests
+
+      - name: Run Zemu tests
         run: |
           cd tests && docker pull zondax/builder-zemu@sha256:8d7b06cedf2d018b9464f4af4b7a8357c3fbb180f3ab153f8cb8f138defb22a4 && yarn test
diff --git a/.github/workflows/lint-workflow.yml b/.github/workflows/lint-workflow.yml
index 24cf229..71e57a1 100644
--- a/.github/workflows/lint-workflow.yml
+++ b/.github/workflows/lint-workflow.yml
@@ -5,11 +5,9 @@ on:
   push:
     branches:
       - main
+      - master
       - develop
   pull_request:
-    branches:
-      - main
-      - develop
 
 jobs:
   job_lint:
@@ -18,11 +16,11 @@ jobs:
 
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Lint
-        uses: DoozyX/clang-format-lint-action@v0.13
+        uses: DoozyX/clang-format-lint-action@v0.15
         with:
           source: "./"
           extensions: "h,c"
-          clangFormatVersion: 12.0.0
+          clangFormatVersion: 12.0.1
diff --git a/Makefile b/Makefile
index e6d55bf..2e2c298 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ APP_LOAD_PARAMS += $(COMMON_LOAD_PARAMS)
 
 APPVERSION_M     = 1
 APPVERSION_N     = 3
-APPVERSION_P     = 0
+APPVERSION_P     = 1
 APPVERSION       = $(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 
 APPNAME = "[ L ] Market"
diff --git a/tests/build_local_test_elfs.sh b/tests/build_local_test_elfs.sh
index f2ab2a3..745874c 100755
--- a/tests/build_local_test_elfs.sh
+++ b/tests/build_local_test_elfs.sh
@@ -17,7 +17,7 @@ echo "*Building elfs for Nano S..."
 echo "**Building app-ledger-nft for Nano S..."
 make clean BOLOS_SDK=$NANOS_SDK
 make -j DEBUG=1 BOLOS_SDK=$NANOS_SDK
-cp bin/app.elf "tests/elfs/ledger_nft_nanos.elf"
+cp bin/app.elf "tests/elfs/plugin_nanos.elf"
 
 echo "**Building app-ethereum for Nano S..."
 cd $APP_ETHEREUM
@@ -33,7 +33,7 @@ echo "*Building elfs for Nano X..."
 echo "**Building app-ledger-nft for Nano X..."
 make clean BOLOS_SDK=$NANOX_SDK
 make -j DEBUG=1 BOLOS_SDK=$NANOX_SDK
-cp bin/app.elf "tests/elfs/ledger_nft_nanox.elf"
+cp bin/app.elf "tests/elfs/plugin_nanox.elf"
 
 echo "**Building app-ethereum for Nano X..."
 cd $APP_ETHEREUM
@@ -48,7 +48,7 @@ export BOLOS_SDK="$NANOSP_SDK"
 echo "**Building app-ledger-nft for Nano S+..."
 make clean
 make -j DEBUG=1
-cp bin/app.elf "tests/elfs/ledger_nft_nanosp.elf"
+cp bin/app.elf "tests/elfs/plugin_nanosp.elf"
 
 echo "**Building app-ethereum for Nano S+..."
 cd $APP_ETHEREUM
diff --git a/tests/networks/ethereum/ledgerNFT/abis/0x12b180053db389b6200e6f646949e6ab7b385d40.abi.json b/tests/networks/ethereum_goerli/ledgerNFT/abis/0x12b180053db389b6200e6f646949e6ab7b385d40.abi.json
similarity index 100%
rename from tests/networks/ethereum/ledgerNFT/abis/0x12b180053db389b6200e6f646949e6ab7b385d40.abi.json
rename to tests/networks/ethereum_goerli/ledgerNFT/abis/0x12b180053db389b6200e6f646949e6ab7b385d40.abi.json
diff --git a/tests/networks/ethereum/ledgerNFT/abis/0x6c304a1f99cecd3a9983001e943f3de00ed811d0.abi.json b/tests/networks/ethereum_goerli/ledgerNFT/abis/0x6c304a1f99cecd3a9983001e943f3de00ed811d0.abi.json
similarity index 100%
rename from tests/networks/ethereum/ledgerNFT/abis/0x6c304a1f99cecd3a9983001e943f3de00ed811d0.abi.json
rename to tests/networks/ethereum_goerli/ledgerNFT/abis/0x6c304a1f99cecd3a9983001e943f3de00ed811d0.abi.json
diff --git a/tests/networks/ethereum/ledgerNFT/abis/0x9ea4571a739a1d644e17d34a86e7dee97609b256.abi.json b/tests/networks/ethereum_goerli/ledgerNFT/abis/0x9ea4571a739a1d644e17d34a86e7dee97609b256.abi.json
similarity index 100%
rename from tests/networks/ethereum/ledgerNFT/abis/0x9ea4571a739a1d644e17d34a86e7dee97609b256.abi.json
rename to tests/networks/ethereum_goerli/ledgerNFT/abis/0x9ea4571a739a1d644e17d34a86e7dee97609b256.abi.json
diff --git a/tests/networks/ethereum/ledgerNFT/b2c.json b/tests/networks/ethereum_goerli/ledgerNFT/b2c.json
similarity index 100%
rename from tests/networks/ethereum/ledgerNFT/b2c.json
rename to tests/networks/ethereum_goerli/ledgerNFT/b2c.json
diff --git a/tests/snapshots/ethereum_nanos_mint/00000.png b/tests/snapshots/ethereum_goerli_nanos_mint/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint/00000.png
rename to tests/snapshots/ethereum_goerli_nanos_mint/00000.png
diff --git a/tests/snapshots/ethereum_nanos_mint/00001.png b/tests/snapshots/ethereum_goerli_nanos_mint/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint/00001.png
rename to tests/snapshots/ethereum_goerli_nanos_mint/00001.png
diff --git a/tests/snapshots/ethereum_nanos_mint/00002.png b/tests/snapshots/ethereum_goerli_nanos_mint/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint/00002.png
rename to tests/snapshots/ethereum_goerli_nanos_mint/00002.png
diff --git a/tests/snapshots/ethereum_nanos_mint/00003.png b/tests/snapshots/ethereum_goerli_nanos_mint/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint/00003.png
rename to tests/snapshots/ethereum_goerli_nanos_mint/00003.png
diff --git a/tests/snapshots/ethereum_nanos_mint/00004.png b/tests/snapshots/ethereum_goerli_nanos_mint/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint/00004.png
rename to tests/snapshots/ethereum_goerli_nanos_mint/00004.png
diff --git a/tests/snapshots/ethereum_nanos_mint/00005.png b/tests/snapshots/ethereum_goerli_nanos_mint/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint/00005.png
rename to tests/snapshots/ethereum_goerli_nanos_mint/00005.png
diff --git a/tests/snapshots/ethereum_nanos_mint/00006.png b/tests/snapshots/ethereum_goerli_nanos_mint/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint/00006.png
rename to tests/snapshots/ethereum_goerli_nanos_mint/00006.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign/00000.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign/00000.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign/00000.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign/00001.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign/00001.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign/00001.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign/00002.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign/00002.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign/00002.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign/00003.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign/00003.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign/00003.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign/00004.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign/00004.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign/00004.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign/00005.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign/00005.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign/00005.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign/00006.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign/00006.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign/00006.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign_v2/00000.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign_v2/00000.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00000.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign_v2/00001.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign_v2/00001.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00001.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign_v2/00002.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign_v2/00002.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00002.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign_v2/00003.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign_v2/00003.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00003.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign_v2/00004.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign_v2/00004.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00004.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign_v2/00005.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign_v2/00005.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00005.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign_v2/00006.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign_v2/00006.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00006.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign_v2/00007.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00007.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign_v2/00007.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00007.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign_v2/00008.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00008.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign_v2/00008.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00008.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign_v2/00009.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00009.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign_v2/00009.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00009.png
diff --git a/tests/snapshots/ethereum_nanos_mint_sign_v2/00010.png b/tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00010.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_sign_v2/00010.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_sign_v2/00010.png
diff --git a/tests/snapshots/ethereum_nanos_mint_v2/00000.png b/tests/snapshots/ethereum_goerli_nanos_mint_v2/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_v2/00000.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_v2/00000.png
diff --git a/tests/snapshots/ethereum_nanos_mint_v2/00001.png b/tests/snapshots/ethereum_goerli_nanos_mint_v2/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_v2/00001.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_v2/00001.png
diff --git a/tests/snapshots/ethereum_nanos_mint_v2/00002.png b/tests/snapshots/ethereum_goerli_nanos_mint_v2/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_v2/00002.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_v2/00002.png
diff --git a/tests/snapshots/ethereum_nanos_mint_v2/00003.png b/tests/snapshots/ethereum_goerli_nanos_mint_v2/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_v2/00003.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_v2/00003.png
diff --git a/tests/snapshots/ethereum_nanos_mint_v2/00004.png b/tests/snapshots/ethereum_goerli_nanos_mint_v2/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_v2/00004.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_v2/00004.png
diff --git a/tests/snapshots/ethereum_nanos_mint_v2/00005.png b/tests/snapshots/ethereum_goerli_nanos_mint_v2/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_v2/00005.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_v2/00005.png
diff --git a/tests/snapshots/ethereum_nanos_mint_v2/00006.png b/tests/snapshots/ethereum_goerli_nanos_mint_v2/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_mint_v2/00006.png
rename to tests/snapshots/ethereum_goerli_nanos_mint_v2/00006.png
diff --git a/tests/snapshots/ethereum_nanos_pre_sale_mint/00000.png b/tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_pre_sale_mint/00000.png
rename to tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00000.png
diff --git a/tests/snapshots/ethereum_nanos_pre_sale_mint/00001.png b/tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_pre_sale_mint/00001.png
rename to tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00001.png
diff --git a/tests/snapshots/ethereum_nanos_pre_sale_mint/00002.png b/tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_pre_sale_mint/00002.png
rename to tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00002.png
diff --git a/tests/snapshots/ethereum_nanos_pre_sale_mint/00003.png b/tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_pre_sale_mint/00003.png
rename to tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00003.png
diff --git a/tests/snapshots/ethereum_nanos_pre_sale_mint/00004.png b/tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_pre_sale_mint/00004.png
rename to tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00004.png
diff --git a/tests/snapshots/ethereum_nanos_pre_sale_mint/00005.png b/tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_pre_sale_mint/00005.png
rename to tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00005.png
diff --git a/tests/snapshots/ethereum_nanos_pre_sale_mint/00006.png b/tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_pre_sale_mint/00006.png
rename to tests/snapshots/ethereum_goerli_nanos_pre_sale_mint/00006.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint/00000.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint/00000.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint/00000.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint/00001.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint/00001.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint/00001.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint/00002.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint/00002.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint/00002.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint/00003.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint/00003.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint/00003.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint/00004.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint/00004.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint/00004.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint/00005.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint/00005.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint/00005.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint/00006.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint/00006.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint/00006.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint_sign/00000.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint_sign/00000.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00000.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint_sign/00001.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint_sign/00001.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00001.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint_sign/00002.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint_sign/00002.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00002.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint_sign/00003.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint_sign/00003.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00003.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint_sign/00004.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint_sign/00004.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00004.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint_sign/00005.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint_sign/00005.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00005.png
diff --git a/tests/snapshots/ethereum_nanos_stable_mint_sign/00006.png b/tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanos_stable_mint_sign/00006.png
rename to tests/snapshots/ethereum_goerli_nanos_stable_mint_sign/00006.png
diff --git a/tests/snapshots/ethereum_nanosp_mint/00000.png b/tests/snapshots/ethereum_goerli_nanosp_mint/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint/00000.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint/00000.png
diff --git a/tests/snapshots/ethereum_nanosp_mint/00001.png b/tests/snapshots/ethereum_goerli_nanosp_mint/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint/00001.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint/00001.png
diff --git a/tests/snapshots/ethereum_nanosp_mint/00002.png b/tests/snapshots/ethereum_goerli_nanosp_mint/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint/00002.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint/00002.png
diff --git a/tests/snapshots/ethereum_nanosp_mint/00003.png b/tests/snapshots/ethereum_goerli_nanosp_mint/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint/00003.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint/00003.png
diff --git a/tests/snapshots/ethereum_nanosp_mint/00004.png b/tests/snapshots/ethereum_goerli_nanosp_mint/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint/00004.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint/00004.png
diff --git a/tests/snapshots/ethereum_nanosp_mint/00005.png b/tests/snapshots/ethereum_goerli_nanosp_mint/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint/00005.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint/00005.png
diff --git a/tests/snapshots/ethereum_nanosp_mint/00006.png b/tests/snapshots/ethereum_goerli_nanosp_mint/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint/00006.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint/00006.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign/00000.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign/00000.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign/00000.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign/00001.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign/00001.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign/00001.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign/00002.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign/00002.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign/00002.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign/00003.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign/00003.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign/00003.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign/00004.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign/00004.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign/00004.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign/00005.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign/00005.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign/00005.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign/00006.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign/00006.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign/00006.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign_v2/00000.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign_v2/00000.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00000.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign_v2/00001.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign_v2/00001.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00001.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign_v2/00002.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign_v2/00002.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00002.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign_v2/00003.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign_v2/00003.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00003.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign_v2/00004.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign_v2/00004.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00004.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign_v2/00005.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign_v2/00005.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00005.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign_v2/00006.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign_v2/00006.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00006.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign_v2/00007.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00007.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign_v2/00007.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00007.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_sign_v2/00008.png b/tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00008.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_sign_v2/00008.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_sign_v2/00008.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_v2/00000.png b/tests/snapshots/ethereum_goerli_nanosp_mint_v2/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_v2/00000.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_v2/00000.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_v2/00001.png b/tests/snapshots/ethereum_goerli_nanosp_mint_v2/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_v2/00001.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_v2/00001.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_v2/00002.png b/tests/snapshots/ethereum_goerli_nanosp_mint_v2/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_v2/00002.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_v2/00002.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_v2/00003.png b/tests/snapshots/ethereum_goerli_nanosp_mint_v2/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_v2/00003.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_v2/00003.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_v2/00004.png b/tests/snapshots/ethereum_goerli_nanosp_mint_v2/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_v2/00004.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_v2/00004.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_v2/00005.png b/tests/snapshots/ethereum_goerli_nanosp_mint_v2/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_v2/00005.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_v2/00005.png
diff --git a/tests/snapshots/ethereum_nanosp_mint_v2/00006.png b/tests/snapshots/ethereum_goerli_nanosp_mint_v2/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_mint_v2/00006.png
rename to tests/snapshots/ethereum_goerli_nanosp_mint_v2/00006.png
diff --git a/tests/snapshots/ethereum_nanosp_pre_sale_mint/00000.png b/tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_pre_sale_mint/00000.png
rename to tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00000.png
diff --git a/tests/snapshots/ethereum_nanosp_pre_sale_mint/00001.png b/tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_pre_sale_mint/00001.png
rename to tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00001.png
diff --git a/tests/snapshots/ethereum_nanosp_pre_sale_mint/00002.png b/tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_pre_sale_mint/00002.png
rename to tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00002.png
diff --git a/tests/snapshots/ethereum_nanosp_pre_sale_mint/00003.png b/tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_pre_sale_mint/00003.png
rename to tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00003.png
diff --git a/tests/snapshots/ethereum_nanosp_pre_sale_mint/00004.png b/tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_pre_sale_mint/00004.png
rename to tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00004.png
diff --git a/tests/snapshots/ethereum_nanosp_pre_sale_mint/00005.png b/tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_pre_sale_mint/00005.png
rename to tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00005.png
diff --git a/tests/snapshots/ethereum_nanosp_pre_sale_mint/00006.png b/tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_pre_sale_mint/00006.png
rename to tests/snapshots/ethereum_goerli_nanosp_pre_sale_mint/00006.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint/00000.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint/00000.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint/00000.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint/00001.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint/00001.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint/00001.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint/00002.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint/00002.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint/00002.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint/00003.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint/00003.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint/00003.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint/00004.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint/00004.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint/00004.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint/00005.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint/00005.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint/00005.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint/00006.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint/00006.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint/00006.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint_sign/00000.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint_sign/00000.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00000.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint_sign/00001.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint_sign/00001.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00001.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint_sign/00002.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint_sign/00002.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00002.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint_sign/00003.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint_sign/00003.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00003.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint_sign/00004.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint_sign/00004.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00004.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint_sign/00005.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint_sign/00005.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00005.png
diff --git a/tests/snapshots/ethereum_nanosp_stable_mint_sign/00006.png b/tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanosp_stable_mint_sign/00006.png
rename to tests/snapshots/ethereum_goerli_nanosp_stable_mint_sign/00006.png
diff --git a/tests/snapshots/ethereum_nanox_mint/00000.png b/tests/snapshots/ethereum_goerli_nanox_mint/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint/00000.png
rename to tests/snapshots/ethereum_goerli_nanox_mint/00000.png
diff --git a/tests/snapshots/ethereum_nanox_mint/00001.png b/tests/snapshots/ethereum_goerli_nanox_mint/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint/00001.png
rename to tests/snapshots/ethereum_goerli_nanox_mint/00001.png
diff --git a/tests/snapshots/ethereum_nanox_mint/00002.png b/tests/snapshots/ethereum_goerli_nanox_mint/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint/00002.png
rename to tests/snapshots/ethereum_goerli_nanox_mint/00002.png
diff --git a/tests/snapshots/ethereum_nanox_mint/00003.png b/tests/snapshots/ethereum_goerli_nanox_mint/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint/00003.png
rename to tests/snapshots/ethereum_goerli_nanox_mint/00003.png
diff --git a/tests/snapshots/ethereum_nanox_mint/00004.png b/tests/snapshots/ethereum_goerli_nanox_mint/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint/00004.png
rename to tests/snapshots/ethereum_goerli_nanox_mint/00004.png
diff --git a/tests/snapshots/ethereum_nanox_mint/00005.png b/tests/snapshots/ethereum_goerli_nanox_mint/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint/00005.png
rename to tests/snapshots/ethereum_goerli_nanox_mint/00005.png
diff --git a/tests/snapshots/ethereum_nanox_mint/00006.png b/tests/snapshots/ethereum_goerli_nanox_mint/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint/00006.png
rename to tests/snapshots/ethereum_goerli_nanox_mint/00006.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign/00000.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign/00000.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign/00000.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign/00001.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign/00001.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign/00001.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign/00002.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign/00002.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign/00002.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign/00003.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign/00003.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign/00003.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign/00004.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign/00004.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign/00004.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign/00005.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign/00005.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign/00005.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign/00006.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign/00006.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign/00006.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign_v2/00000.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign_v2/00000.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00000.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign_v2/00001.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign_v2/00001.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00001.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign_v2/00002.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign_v2/00002.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00002.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign_v2/00003.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign_v2/00003.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00003.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign_v2/00004.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign_v2/00004.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00004.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign_v2/00005.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign_v2/00005.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00005.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign_v2/00006.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign_v2/00006.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00006.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign_v2/00007.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00007.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign_v2/00007.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00007.png
diff --git a/tests/snapshots/ethereum_nanox_mint_sign_v2/00008.png b/tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00008.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_sign_v2/00008.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_sign_v2/00008.png
diff --git a/tests/snapshots/ethereum_nanox_mint_v2/00000.png b/tests/snapshots/ethereum_goerli_nanox_mint_v2/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_v2/00000.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_v2/00000.png
diff --git a/tests/snapshots/ethereum_nanox_mint_v2/00001.png b/tests/snapshots/ethereum_goerli_nanox_mint_v2/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_v2/00001.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_v2/00001.png
diff --git a/tests/snapshots/ethereum_nanox_mint_v2/00002.png b/tests/snapshots/ethereum_goerli_nanox_mint_v2/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_v2/00002.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_v2/00002.png
diff --git a/tests/snapshots/ethereum_nanox_mint_v2/00003.png b/tests/snapshots/ethereum_goerli_nanox_mint_v2/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_v2/00003.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_v2/00003.png
diff --git a/tests/snapshots/ethereum_nanox_mint_v2/00004.png b/tests/snapshots/ethereum_goerli_nanox_mint_v2/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_v2/00004.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_v2/00004.png
diff --git a/tests/snapshots/ethereum_nanox_mint_v2/00005.png b/tests/snapshots/ethereum_goerli_nanox_mint_v2/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_v2/00005.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_v2/00005.png
diff --git a/tests/snapshots/ethereum_nanox_mint_v2/00006.png b/tests/snapshots/ethereum_goerli_nanox_mint_v2/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_mint_v2/00006.png
rename to tests/snapshots/ethereum_goerli_nanox_mint_v2/00006.png
diff --git a/tests/snapshots/ethereum_nanox_pre_sale_mint/00000.png b/tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_pre_sale_mint/00000.png
rename to tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00000.png
diff --git a/tests/snapshots/ethereum_nanox_pre_sale_mint/00001.png b/tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_pre_sale_mint/00001.png
rename to tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00001.png
diff --git a/tests/snapshots/ethereum_nanox_pre_sale_mint/00002.png b/tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_pre_sale_mint/00002.png
rename to tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00002.png
diff --git a/tests/snapshots/ethereum_nanox_pre_sale_mint/00003.png b/tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_pre_sale_mint/00003.png
rename to tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00003.png
diff --git a/tests/snapshots/ethereum_nanox_pre_sale_mint/00004.png b/tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_pre_sale_mint/00004.png
rename to tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00004.png
diff --git a/tests/snapshots/ethereum_nanox_pre_sale_mint/00005.png b/tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_pre_sale_mint/00005.png
rename to tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00005.png
diff --git a/tests/snapshots/ethereum_nanox_pre_sale_mint/00006.png b/tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_pre_sale_mint/00006.png
rename to tests/snapshots/ethereum_goerli_nanox_pre_sale_mint/00006.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint/00000.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint/00000.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint/00000.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint/00001.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint/00001.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint/00001.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint/00002.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint/00002.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint/00002.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint/00003.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint/00003.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint/00003.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint/00004.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint/00004.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint/00004.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint/00005.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint/00005.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint/00005.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint/00006.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint/00006.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint/00006.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint_sign/00000.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00000.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint_sign/00000.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00000.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint_sign/00001.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00001.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint_sign/00001.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00001.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint_sign/00002.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00002.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint_sign/00002.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00002.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint_sign/00003.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00003.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint_sign/00003.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00003.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint_sign/00004.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00004.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint_sign/00004.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00004.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint_sign/00005.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00005.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint_sign/00005.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00005.png
diff --git a/tests/snapshots/ethereum_nanox_stable_mint_sign/00006.png b/tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00006.png
similarity index 100%
rename from tests/snapshots/ethereum_nanox_stable_mint_sign/00006.png
rename to tests/snapshots/ethereum_goerli_nanox_stable_mint_sign/00006.png
diff --git a/tests/src/mint.test.js b/tests/src/mint.test.js
index 4a39cbd..2b62f2a 100644
--- a/tests/src/mint.test.js
+++ b/tests/src/mint.test.js
@@ -5,7 +5,7 @@ const contractName = "MultiMintContractNFT";
 const testLabel = "Mint"; // <= Name of the test
 const testDirSuffix = "mint"; // <= directory to compare device snapshots to
 const signedPlugin = false;
-const testNetwork = "ethereum";
+const testNetwork = "ethereum_goerli";
 
 const contractAddr = "0x6c304a1f99cecd3a9983001e943f3de00ed811d0";
 const chainID = 1;
diff --git a/tests/src/mintSign.test.js b/tests/src/mintSign.test.js
index 39385e6..7b98994 100644
--- a/tests/src/mintSign.test.js
+++ b/tests/src/mintSign.test.js
@@ -5,7 +5,7 @@ const contractName = "StableMultiMintERC721";
 const testLabel = "mintSign"; // <= Name of the test
 const testDirSuffix = "mint_sign"; // <= directory to compare device snapshots to
 const signedPlugin = false;
-const testNetwork = "ethereum";
+const testNetwork = "ethereum_goerli";
 
 const contractAddr = "0x9ea4571a739a1d644e17d34a86e7dee97609b256";
 const chainID = 1;
diff --git a/tests/src/mintSignV2.test.js b/tests/src/mintSignV2.test.js
index 7dfad6c..0ed4e6c 100644
--- a/tests/src/mintSignV2.test.js
+++ b/tests/src/mintSignV2.test.js
@@ -5,7 +5,7 @@ const contractName = "MultiMint1155";
 const testLabel = "mintSignV2"; // <= Name of the test
 const testDirSuffix = "mint_sign_v2"; // <= directory to compare device snapshots to
 const signedPlugin = false;
-const testNetwork = "ethereum";
+const testNetwork = "ethereum_goerli";
 
 const contractAddr = "0x12b180053db389b6200e6f646949e6ab7b385d40";
 const chainID = 1;
diff --git a/tests/src/mintV2.test.js b/tests/src/mintV2.test.js
index 28da2b3..80e2500 100644
--- a/tests/src/mintV2.test.js
+++ b/tests/src/mintV2.test.js
@@ -5,7 +5,7 @@ const contractName = "StableMultiMintERC721";
 const testLabel = "mintV2"; // <= Name of the test
 const testDirSuffix = "mint_v2"; // <= directory to compare device snapshots to
 const signedPlugin = false;
-const testNetwork = "ethereum";
+const testNetwork = "ethereum_goerli";
 
 const contractAddr = "0x9ea4571a739a1d644e17d34a86e7dee97609b256";
 const chainID = 1;
diff --git a/tests/src/preSaleMint.test.js b/tests/src/preSaleMint.test.js
index 3bff7fa..567d414 100644
--- a/tests/src/preSaleMint.test.js
+++ b/tests/src/preSaleMint.test.js
@@ -5,7 +5,7 @@ const contractName = "MultiMintContractNFT";
 const testLabel = "PreSaleMint"; // <= Name of the test
 const testDirSuffix = "pre_sale_mint"; // <= directory to compare device snapshots to
 const signedPlugin = false;
-const testNetwork = "ethereum";
+const testNetwork = "ethereum_goerli";
 
 const contractAddr = "0x6c304a1f99cecd3a9983001e943f3de00ed811d0";
 const chainID = 1;
diff --git a/tests/src/stableMint.test.js b/tests/src/stableMint.test.js
index 3900a08..64ecc17 100644
--- a/tests/src/stableMint.test.js
+++ b/tests/src/stableMint.test.js
@@ -5,7 +5,7 @@ const contractName = "StableMultiMintERC721";
 const testLabel = "StableMint"; // <= Name of the test
 const testDirSuffix = "stable_mint"; // <= directory to compare device snapshots to
 const signedPlugin = false;
-const testNetwork = "ethereum";
+const testNetwork = "ethereum_goerli";
 
 const contractAddr = "0x9ea4571a739a1d644e17d34a86e7dee97609b256";
 const chainID = 1;
diff --git a/tests/src/stableMintSign.test.js b/tests/src/stableMintSign.test.js
index c6e9159..2bdaaef 100644
--- a/tests/src/stableMintSign.test.js
+++ b/tests/src/stableMintSign.test.js
@@ -5,7 +5,7 @@ const contractName = "StableMultiMintERC721";
 const testLabel = "StableMintSign"; // <= Name of the test
 const testDirSuffix = "stable_mint_sign"; // <= directory to compare device snapshots to
 const signedPlugin = false;
-const testNetwork = "ethereum";
+const testNetwork = "ethereum_goerli";
 
 const contractAddr = "0x9ea4571a739a1d644e17d34a86e7dee97609b256";
 const chainID = 1;
diff --git a/tests/src/test.fixture.js b/tests/src/test.fixture.js
index cf771ac..56b300a 100644
--- a/tests/src/test.fixture.js
+++ b/tests/src/test.fixture.js
@@ -24,9 +24,9 @@ const NANOS_ETH_PATH = Resolve("elfs/ethereum_nanos.elf");
 const NANOSP_ETH_PATH = Resolve("elfs/ethereum_nanosp.elf");
 const NANOX_ETH_PATH = Resolve("elfs/ethereum_nanox.elf");
 
-const NANOS_PLUGIN_PATH = Resolve("elfs/ledger_nft_nanos.elf");
-const NANOSP_PLUGIN_PATH = Resolve("elfs/ledger_nft_nanosp.elf");
-const NANOX_PLUGIN_PATH = Resolve("elfs/ledger_nft_nanox.elf");
+const NANOS_PLUGIN_PATH = Resolve("elfs/plugin_nanos.elf");
+const NANOSP_PLUGIN_PATH = Resolve("elfs/plugin_nanosp.elf");
+const NANOX_PLUGIN_PATH = Resolve("elfs/plugin_nanox.elf");
 
 const NANOS_PLUGIN = { "LedgerNFT": NANOS_PLUGIN_PATH };
 const NANOSP_PLUGIN = { "LedgerNFT": NANOSP_PLUGIN_PATH };
@@ -49,6 +49,7 @@ let genericTx = {
 let config;
 
 const TIMEOUT = 1000000;
+jest.setTimeout(TIMEOUT);
 
 /**
  * Generates a serializedTransaction from a rawHexTransaction copy pasted from etherscan.
@@ -87,7 +88,7 @@ function txFromEtherscan(rawTx) {
   * Emulation of the device using zemu
   * @param {string} device name of the device to emulate (nanos, nanox)
   * @param {function} func
-  * @param {boolean} signed the plugin is already signed 
+  * @param {boolean} signed the plugin is already signed
   * @returns {Promise}
   */
 function zemu(device, func, testNetwork, signed = false) {
@@ -184,7 +185,6 @@ async function processTransaction(eth, sim, steps, label, rawTxHex, srlTx = "")
  * @param {boolean} signed The plugin is already signed and existing in Ledger database
  */
 function processTest(device, contractName, testLabel, testDirSuffix, rawTxHex, signed, serializedTx, testNetwork) {
-    jest.setTimeout(TIMEOUT);
     test(
         "[" + contractName + "] - " + device.label + " - " + testLabel,
         zemu(device.name, async (sim, eth) => {