diff --git a/tests/lib/ethereum.test.js b/tests/lib/ethereum.test.js
index be62dd1..c2ae960 100644
--- a/tests/lib/ethereum.test.js
+++ b/tests/lib/ethereum.test.js
@@ -14,27 +14,152 @@ var _errors = require("@ledgerhq/errors");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-test("Test USDT Lend on Compound", async () => {
+const {
+  NANOS_PATH,
+  NANOX_PATH,
+  sim_options_nanos,
+  sim_options_nanox
+} = require("generic.js");
+
+test("Transfer nanos", async () => {
   jest.setTimeout(100000);
   const sim = new _zemu.default(NANOS_PATH);
 
   try {
-    await sim.start(sim_options);
+    await sim.start(sim_options_nanos);
     let transport = await sim.getTransport();
     const eth = new _hwAppEth.default(transport); // Send transaction
     // https://etherscan.io/tx/0xa0f067369c92d240e253ac3bcb7b7aa56952f7e6feb4c2d93239713fb4e2c40e
 
     let tx = eth.signTransaction("44'/60'/0'/0/0", "F8A95F850684EE180082CA2D944297394C20800E8A38A619A243E9BBE7681FF24E80B844A9059CBB000000000000000000000000D99A9739CF8B0BF66A7C99D9E14510C3146358C60000000000000000000000000000000000000000000002F0DEB79238F100000025A04CABB0BD9DFDC55605915450F9C7E0E3311996071D9F722BFA12E09C9EF8A23FA03DD645E1DA9B19448A327CC5ADCF89FA228C3642528D60258D9AE32A5B07F7A2");
-    await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot());
-    await sim.clickRight();
-    await sim.clickRight();
-    await sim.clickRight();
-    await sim.clickRight();
+    await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot()); // Review tx
+
+    await sim.clickRight(); // Data Present
+
+    await sim.clickRight(); // Amount
+
+    await sim.clickRight(); // Address 1/3
+
+    await sim.clickRight(); // Address 2/3
+
+    await sim.clickRight(); // Address 3/3
+
+    await sim.clickRight(); // Chain ID
+
+    await sim.clickRight(); // Max Fees
+
+    await sim.clickRight(); // Accept
+
     await sim.clickBoth();
     await expect(tx).resolves.toEqual({
-      r: "e8c2b5b956b34386e68c5cc5bfc76aac158706430fcf1c71c9f6eb7d9dd690c8",
-      s: "064005410a778b047fdd4afcb1e712217c297e5b0a2190f88b9e56ac745fae69",
-      v: "26"
+      r: "610f4e866a960467e139387d21a922e836c6ae09af548940aa8ceaa04f720ab4",
+      s: "1e9f5e10bf4667c3a8b094856af1d1a98faa544331f654158255fe87cbb55737",
+      v: "6d"
+    });
+  } finally {
+    await sim.close();
+  }
+});
+test("Transfer nanox", async () => {
+  jest.setTimeout(100000);
+  const sim = new _zemu.default(NANOX_PATH);
+
+  try {
+    await sim.start(sim_options_nanox);
+    let transport = await sim.getTransport();
+    const eth = new _hwAppEth.default(transport); // Send transaction
+    // https://etherscan.io/tx/0xa0f067369c92d240e253ac3bcb7b7aa56952f7e6feb4c2d93239713fb4e2c40e
+
+    let tx = eth.signTransaction("44'/60'/0'/0/0", "F8A95F850684EE180082CA2D944297394C20800E8A38A619A243E9BBE7681FF24E80B844A9059CBB000000000000000000000000D99A9739CF8B0BF66A7C99D9E14510C3146358C60000000000000000000000000000000000000000000002F0DEB79238F100000025A04CABB0BD9DFDC55605915450F9C7E0E3311996071D9F722BFA12E09C9EF8A23FA03DD645E1DA9B19448A327CC5ADCF89FA228C3642528D60258D9AE32A5B07F7A2");
+    await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot()); // Review tx
+
+    await sim.clickRight(); // Data Present
+
+    await sim.clickRight(); // Amount
+
+    await sim.clickRight(); // Address 1
+
+    await sim.clickRight(); // Chain ID
+
+    await sim.clickRight(); // Max Fees
+
+    await sim.clickRight(); // Accept
+
+    await sim.clickBoth();
+    await expect(tx).resolves.toEqual({
+      r: "760c0d133c1095830614736e24c5741dcfcf1c46aeb301c3f213d92eac66c7b8",
+      s: "0e19d23ef82e04d2a3e77bc24ad036a381a2a12333b8d9228776bedf08092472",
+      v: "6e"
+    });
+  } finally {
+    await sim.close();
+  }
+});
+test("Deposit nanos", async () => {
+  jest.setTimeout(100000);
+  const sim = new _zemu.default(NANOS_PATH);
+
+  try {
+    await sim.start(sim_options_nanos);
+    let transport = await sim.getTransport();
+    const eth = new _hwAppEth.default(transport); // Deposit transaction
+    // https://etherscan.io/tx/0xf2ff5519baafdc46c3b300e03e189a5b45f48552969fd6bc45ed6e3adb0ecb5f
+
+    let tx = eth.signTransaction("44'/60'/0'/0/0", "f8eb81958508e534039d8302177594d54f502e184b6b739d7d27a6410a67dc462d69c880b8842505c3d903f33191df6561f0409b39172d41aafe1edef210994ef40957a0a2afc4d9d1ec02893294412a4c8f915f75892b395ebbf6859ec246ec365c3b1f56f47c3a0a5d00000000000000000000000000000000000000000000000000000000000045c90000000000000000000000000000000000000000000000000000000041be71c025a0dd2ca8adf62d74dd023a35695281e9859737fecf3597409915e63bf4297ebf20a022e73752616372ce3cf2e473d951f4063227df1a2ace5a2320314803f6993b72");
+    await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot()); // Review tx
+
+    await sim.clickRight(); // Data Present
+
+    await sim.clickRight(); // Amount
+
+    await sim.clickRight(); // Address 1
+
+    await sim.clickRight(); // Chain ID
+
+    await sim.clickRight(); // Max Fees
+
+    await sim.clickRight(); // Accept
+
+    await sim.clickBoth();
+    await expect(tx).resolves.toEqual({
+      r: "760c0d133c1095830614736e24c5741dcfcf1c46aeb301c3f213d92eac66c7b8",
+      s: "0e19d23ef82e04d2a3e77bc24ad036a381a2a12333b8d9228776bedf08092472",
+      v: "6e"
+    });
+  } finally {
+    await sim.close();
+  }
+});
+test("Deposit nanox", async () => {
+  jest.setTimeout(100000);
+  const sim = new _zemu.default(NANOX_PATH);
+
+  try {
+    await sim.start(sim_options_nanox);
+    let transport = await sim.getTransport();
+    const eth = new _hwAppEth.default(transport); // Deposit transaction
+    // https://etherscan.io/tx/0xf2ff5519baafdc46c3b300e03e189a5b45f48552969fd6bc45ed6e3adb0ecb5f
+
+    let tx = eth.signTransaction("44'/60'/0'/0/0", "f8eb81958508e534039d8302177594d54f502e184b6b739d7d27a6410a67dc462d69c880b8842505c3d903f33191df6561f0409b39172d41aafe1edef210994ef40957a0a2afc4d9d1ec02893294412a4c8f915f75892b395ebbf6859ec246ec365c3b1f56f47c3a0a5d00000000000000000000000000000000000000000000000000000000000045c90000000000000000000000000000000000000000000000000000000041be71c025a0dd2ca8adf62d74dd023a35695281e9859737fecf3597409915e63bf4297ebf20a022e73752616372ce3cf2e473d951f4063227df1a2ace5a2320314803f6993b72");
+    await sim.waitUntilScreenIsNot(sim.getMainMenuSnapshot()); // Review tx
+
+    await sim.clickRight(); // Data Present
+
+    await sim.clickRight(); // Amount
+
+    await sim.clickRight(); // Address 1
+
+    await sim.clickRight(); // Chain ID
+
+    await sim.clickRight(); // Max Fees
+
+    await sim.clickRight(); // Accept
+
+    await sim.clickBoth();
+    await expect(tx).resolves.toEqual({
+      r: "610f4e866a960467e139387d21a922e836c6ae09af548940aa8ceaa04f720ab4",
+      s: "1e9f5e10bf4667c3a8b094856af1d1a98faa544331f654158255fe87cbb55737",
+      v: "6d"
     });
   } finally {
     await sim.close();
diff --git a/tests/lib/generic.js b/tests/lib/generic.js
new file mode 100644
index 0000000..f1f0406
--- /dev/null
+++ b/tests/lib/generic.js
@@ -0,0 +1,27 @@
+"use strict";
+
+const sim_options_nanos = {
+  model: "nanos",
+  logging: true,
+  start_delay: 2000,
+  X11: true,
+  custom: ""
+};
+const sim_options_nanox = {
+  model: "nanox",
+  logging: true,
+  start_delay: 2000,
+  X11: true,
+  custom: ""
+};
+
+const Resolve = require("path").resolve;
+
+const NANOS_PATH = Resolve("elfs/ethereum_nanos.elf");
+const NANOX_PATH = Resolve("elfs/ethereum_nanox.elf");
+module.exports = {
+  NANOS_PATH,
+  NANOX_PATH,
+  sim_options_nanos,
+  sim_options_nanox
+};
\ No newline at end of file
diff --git a/tests/src/ethereum.test.js b/tests/src/ethereum.test.js
index 37b33bf..dd7032b 100644
--- a/tests/src/ethereum.test.js
+++ b/tests/src/ethereum.test.js
@@ -89,9 +89,9 @@ test("Transfer nanox", async () => {
     await sim.clickBoth();
 
     await expect(tx).resolves.toEqual({
-      r: "760c0d133c1095830614736e24c5741dcfcf1c46aeb301c3f213d92eac66c7b8",
-      s: "0e19d23ef82e04d2a3e77bc24ad036a381a2a12333b8d9228776bedf08092472",
-      v: "6e"
+      r: "610f4e866a960467e139387d21a922e836c6ae09af548940aa8ceaa04f720ab4",
+      s: "1e9f5e10bf4667c3a8b094856af1d1a98faa544331f654158255fe87cbb55737",
+      v: "6d",
     });
   } finally {
     await sim.close();
@@ -124,9 +124,17 @@ test("Deposit nanos", async () => {
     await sim.clickRight();
     // Address 1
     await sim.clickRight();
+    // Address 2
+    await sim.clickRight();
+    // Address 3
+    await sim.clickRight();
     // Chain ID
     await sim.clickRight();
-    // Max Fees
+    // Max Fees 1
+    await sim.clickRight();
+    // Max Fees 2
+    await sim.clickRight();
+    // Max Fees 3
     await sim.clickRight();
     // Accept
     await sim.clickBoth();
@@ -169,15 +177,16 @@ test("Deposit nanox", async () => {
     await sim.clickRight();
     // Chain ID
     await sim.clickRight();
-    // Max Fees
+    // Max Fees 1/2
     await sim.clickRight();
+
     // Accept
     await sim.clickBoth();
 
     await expect(tx).resolves.toEqual({
-      r: "610f4e866a960467e139387d21a922e836c6ae09af548940aa8ceaa04f720ab4",
-      s: "1e9f5e10bf4667c3a8b094856af1d1a98faa544331f654158255fe87cbb55737",
-      v: "6d",
+      r: "760c0d133c1095830614736e24c5741dcfcf1c46aeb301c3f213d92eac66c7b8",
+      s: "0e19d23ef82e04d2a3e77bc24ad036a381a2a12333b8d9228776bedf08092472",
+      v: "6e",
     });
 
   } finally {