diff --git a/src/main/java/co/rsk/bitcoinj/script/ErpFederationRedeemScriptParser.java b/src/main/java/co/rsk/bitcoinj/script/ErpFederationRedeemScriptParser.java
index 538278106..cb40a005a 100644
--- a/src/main/java/co/rsk/bitcoinj/script/ErpFederationRedeemScriptParser.java
+++ b/src/main/java/co/rsk/bitcoinj/script/ErpFederationRedeemScriptParser.java
@@ -15,14 +15,10 @@ public class ErpFederationRedeemScriptParser extends StandardRedeemScriptParser
     public static long MAX_CSV_VALUE = 65_535L; // 2^16 - 1, since bitcoin will interpret up to 16 bits as the CSV value
 
     public ErpFederationRedeemScriptParser(
-        ScriptType scriptType,
-        List<ScriptChunk> redeemScriptChunks,
-        List<ScriptChunk> rawChunks
+        List<ScriptChunk> redeemScriptChunks
     ) {
         super(
-            scriptType,
-            extractStandardRedeemScript(redeemScriptChunks).getChunks(),
-            rawChunks
+            extractStandardRedeemScript(redeemScriptChunks).getChunks()
         );
         this.multiSigType = MultiSigType.ERP_FED;
     }
diff --git a/src/main/java/co/rsk/bitcoinj/script/FastBridgeErpRedeemScriptParser.java b/src/main/java/co/rsk/bitcoinj/script/FastBridgeErpRedeemScriptParser.java
index e88ccef58..4b99cdf8d 100644
--- a/src/main/java/co/rsk/bitcoinj/script/FastBridgeErpRedeemScriptParser.java
+++ b/src/main/java/co/rsk/bitcoinj/script/FastBridgeErpRedeemScriptParser.java
@@ -10,14 +10,10 @@ public class FastBridgeErpRedeemScriptParser extends StandardRedeemScriptParser
     private static final Logger logger = LoggerFactory.getLogger(FastBridgeErpRedeemScriptParser.class);
 
     public FastBridgeErpRedeemScriptParser(
-        ScriptType scriptType,
-        List<ScriptChunk> redeemScriptChunks,
-        List<ScriptChunk> rawChunks
+        List<ScriptChunk> redeemScriptChunks
     ) {
         super(
-            scriptType,
-            extractStandardRedeemScript(redeemScriptChunks).getChunks(),
-            rawChunks
+            extractStandardRedeemScript(redeemScriptChunks).getChunks()
         );
         this.multiSigType = MultiSigType.FAST_BRIDGE_ERP_FED;
     }
diff --git a/src/main/java/co/rsk/bitcoinj/script/FastBridgeP2shErpRedeemScriptParser.java b/src/main/java/co/rsk/bitcoinj/script/FastBridgeP2shErpRedeemScriptParser.java
index a4b6430ee..d384b3257 100644
--- a/src/main/java/co/rsk/bitcoinj/script/FastBridgeP2shErpRedeemScriptParser.java
+++ b/src/main/java/co/rsk/bitcoinj/script/FastBridgeP2shErpRedeemScriptParser.java
@@ -11,14 +11,10 @@ public class FastBridgeP2shErpRedeemScriptParser extends StandardRedeemScriptPar
     private static final Logger logger = LoggerFactory.getLogger(FastBridgeP2shErpRedeemScriptParser.class);
 
     public FastBridgeP2shErpRedeemScriptParser(
-        ScriptType scriptType,
-        List<ScriptChunk> redeemScriptChunks,
-        List<ScriptChunk> rawChunks
+        List<ScriptChunk> redeemScriptChunks
     ) {
         super(
-            scriptType,
-            extractStandardRedeemScript(redeemScriptChunks).getChunks(),
-            rawChunks
+            extractStandardRedeemScript(redeemScriptChunks).getChunks()
         );
         this.multiSigType = MultiSigType.FAST_BRIDGE_P2SH_ERP_FED;
     }
diff --git a/src/main/java/co/rsk/bitcoinj/script/FastBridgeRedeemScriptParser.java b/src/main/java/co/rsk/bitcoinj/script/FastBridgeRedeemScriptParser.java
index 763e92cbb..36fba8ef4 100644
--- a/src/main/java/co/rsk/bitcoinj/script/FastBridgeRedeemScriptParser.java
+++ b/src/main/java/co/rsk/bitcoinj/script/FastBridgeRedeemScriptParser.java
@@ -12,14 +12,10 @@ public class FastBridgeRedeemScriptParser extends StandardRedeemScriptParser {
     protected final byte[] derivationHash;
 
     public FastBridgeRedeemScriptParser(
-        ScriptType scriptType,
-        List<ScriptChunk> redeemScriptChunks,
-        List<ScriptChunk> rawChunks
+        List<ScriptChunk> redeemScriptChunks
     ) {
         super(
-            scriptType,
-            redeemScriptChunks.subList(2, redeemScriptChunks.size()),
-            rawChunks
+            redeemScriptChunks.subList(2, redeemScriptChunks.size())
         );
         this.multiSigType = MultiSigType.FAST_BRIDGE_MULTISIG;
         this.derivationHash = redeemScriptChunks.get(0).data;
diff --git a/src/main/java/co/rsk/bitcoinj/script/NoRedeemScriptParser.java b/src/main/java/co/rsk/bitcoinj/script/NoRedeemScriptParser.java
index 381e24f86..b51e5af71 100644
--- a/src/main/java/co/rsk/bitcoinj/script/NoRedeemScriptParser.java
+++ b/src/main/java/co/rsk/bitcoinj/script/NoRedeemScriptParser.java
@@ -12,20 +12,11 @@ public MultiSigType getMultiSigType() {
         return MultiSigType.NO_MULTISIG_TYPE;
     }
 
-    @Override
-    public ScriptType getScriptType() {
-        return ScriptType.UNDEFINED;
-    }
-
     @Override
     public int getM() {
         return -1;
     }
 
-    @Override
-    public int getSigInsertionIndex(Sha256Hash hash, BtcECKey signingKey) {
-        return 0;
-    }
 
     @Override
     public int findKeyInRedeem(BtcECKey key) {
diff --git a/src/main/java/co/rsk/bitcoinj/script/P2shErpFederationRedeemScriptParser.java b/src/main/java/co/rsk/bitcoinj/script/P2shErpFederationRedeemScriptParser.java
index 2ab47dcca..d9304ea6d 100644
--- a/src/main/java/co/rsk/bitcoinj/script/P2shErpFederationRedeemScriptParser.java
+++ b/src/main/java/co/rsk/bitcoinj/script/P2shErpFederationRedeemScriptParser.java
@@ -14,14 +14,10 @@ public class P2shErpFederationRedeemScriptParser extends StandardRedeemScriptPar
     public static long MAX_CSV_VALUE = 65_535L; // 2^16 - 1, since bitcoin will interpret up to 16 bits as the CSV value
 
     public P2shErpFederationRedeemScriptParser(
-        ScriptType scriptType,
-        List<ScriptChunk> redeemScriptChunks,
-        List<ScriptChunk> rawChunks
+        List<ScriptChunk> redeemScriptChunks
     ) {
         super(
-            scriptType,
-            extractStandardRedeemScript(redeemScriptChunks).getChunks(),
-            rawChunks
+            extractStandardRedeemScript(redeemScriptChunks).getChunks()
         );
         this.multiSigType = MultiSigType.P2SH_ERP_FED;
     }
diff --git a/src/main/java/co/rsk/bitcoinj/script/RedeemScriptParser.java b/src/main/java/co/rsk/bitcoinj/script/RedeemScriptParser.java
index 4a9457b98..69cd1d0f1 100644
--- a/src/main/java/co/rsk/bitcoinj/script/RedeemScriptParser.java
+++ b/src/main/java/co/rsk/bitcoinj/script/RedeemScriptParser.java
@@ -16,20 +16,12 @@ enum MultiSigType {
         FAST_BRIDGE_P2SH_ERP_FED
     }
 
-    enum ScriptType {
-        P2SH,
-        REDEEM_SCRIPT,
-        UNDEFINED
-    }
 
     MultiSigType getMultiSigType();
 
-    ScriptType getScriptType();
 
     int getM();
 
-    int getSigInsertionIndex(Sha256Hash hash, BtcECKey signingKey);
-
     int findKeyInRedeem(BtcECKey key);
 
     List<BtcECKey> getPubKeys();
diff --git a/src/main/java/co/rsk/bitcoinj/script/RedeemScriptParserFactory.java b/src/main/java/co/rsk/bitcoinj/script/RedeemScriptParserFactory.java
index 7e5f29beb..16774246c 100644
--- a/src/main/java/co/rsk/bitcoinj/script/RedeemScriptParserFactory.java
+++ b/src/main/java/co/rsk/bitcoinj/script/RedeemScriptParserFactory.java
@@ -1,8 +1,6 @@
 package co.rsk.bitcoinj.script;
 
-import co.rsk.bitcoinj.core.ScriptException;
 import co.rsk.bitcoinj.core.Utils;
-import co.rsk.bitcoinj.script.RedeemScriptParser.ScriptType;
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -27,57 +25,39 @@ public static RedeemScriptParser get(List<ScriptChunk> chunks) {
             return new NoRedeemScriptParser();
         }
 
-        ParseResult result = extractRedeemScriptFromChunks(chunks);
-
-        if (result == null) {
-            return new NoRedeemScriptParser();
-        }
-
-        if (FastBridgeRedeemScriptParser.isFastBridgeMultiSig(result.internalScript)) {
+        if (FastBridgeRedeemScriptParser.isFastBridgeMultiSig(chunks)) {
             logger.debug("[get] Return FastBridgeRedeemScriptParser");
             return new FastBridgeRedeemScriptParser(
-                result.scriptType,
-                result.internalScript,
                 chunks
             );
         }
-        if (StandardRedeemScriptParser.isStandardMultiSig(result.internalScript)) {
+        if (StandardRedeemScriptParser.isStandardMultiSig(chunks)) {
             logger.debug("[get] Return StandardRedeemScriptParser");
             return new StandardRedeemScriptParser(
-                result.scriptType,
-                result.internalScript,
                 chunks
             );
         }
-        if (P2shErpFederationRedeemScriptParser.isP2shErpFed(result.internalScript)) {
+        if (P2shErpFederationRedeemScriptParser.isP2shErpFed(chunks)) {
             logger.debug("[get] Return P2shErpFederationRedeemScriptParser");
             return new P2shErpFederationRedeemScriptParser(
-                result.scriptType,
-                result.internalScript,
                 chunks
             );
         }
-        if (FastBridgeP2shErpRedeemScriptParser.isFastBridgeP2shErpFed(result.internalScript)) {
+        if (FastBridgeP2shErpRedeemScriptParser.isFastBridgeP2shErpFed(chunks)) {
             logger.debug("[get] Return FastBridgeP2shErpRedeemScriptParser");
             return new FastBridgeP2shErpRedeemScriptParser(
-                result.scriptType,
-                result.internalScript,
                 chunks
             );
         }
-        if (ErpFederationRedeemScriptParser.isErpFed(result.internalScript)) {
+        if (ErpFederationRedeemScriptParser.isErpFed(chunks)) {
             logger.debug("[get] Return ErpFederationRedeemScriptParser");
             return new ErpFederationRedeemScriptParser(
-                result.scriptType,
-                result.internalScript,
                 chunks
             );
         }
-        if (FastBridgeErpRedeemScriptParser.isFastBridgeErpFed(result.internalScript)) {
+        if (FastBridgeErpRedeemScriptParser.isFastBridgeErpFed(chunks)) {
             logger.debug("[get] Return FastBridgeErpRedeemScriptParser");
             return new FastBridgeErpRedeemScriptParser(
-                result.scriptType,
-                result.internalScript,
                 chunks
             );
         }
@@ -85,40 +65,4 @@ public static RedeemScriptParser get(List<ScriptChunk> chunks) {
         logger.debug("[get] Return NoRedeemScriptParser");
         return new NoRedeemScriptParser();
     }
-
-    private static ParseResult extractRedeemScriptFromChunks(List<ScriptChunk> chunks) {
-        ScriptChunk lastChunk = chunks.get(chunks.size() - 1);
-        if (RedeemScriptValidator.isRedeemLikeScript(chunks)) {
-            return new ParseResult(chunks, ScriptType.REDEEM_SCRIPT);
-        }
-        if (lastChunk.data != null && lastChunk.data.length > 0) {
-            int lastByte = lastChunk.data[lastChunk.data.length - 1] & 0xff;
-            // ERP and standard (+fastBridge) finish with OP_CHECKMULTISIG and P2SHERP (+fastBridge) finish with OP_ENDIF
-            if (
-                    lastByte == ScriptOpCodes.OP_CHECKMULTISIG ||
-                    lastByte == ScriptOpCodes.OP_CHECKMULTISIGVERIFY ||
-                    lastByte == ScriptOpCodes.OP_ENDIF
-            ) {
-                ScriptParserResult result = ScriptParser.parseScriptProgram(lastChunk.data);
-                if (result.getException().isPresent()) {
-                    String message = String.format("Error trying to parse inner script. %s", result.getException().get());
-                    logger.debug("[extractRedeemScriptFromChunks] {}", message);
-                    throw new ScriptException(message);
-                }
-                return new ParseResult(result.getChunks(), ScriptType.P2SH);
-            }
-        }
-        logger.debug("[extractRedeemScriptFromChunks] Could not get redeem script from given chunks");
-        return null;
-    }
-
-    private static class ParseResult {
-        public final List<ScriptChunk> internalScript;
-        public final ScriptType scriptType;
-
-        public ParseResult(List<ScriptChunk> internalScript, ScriptType scriptType) {
-            this.internalScript = internalScript;
-            this.scriptType = scriptType;
-        }
-    }
 }
diff --git a/src/main/java/co/rsk/bitcoinj/script/RedeemScriptUtils.java b/src/main/java/co/rsk/bitcoinj/script/RedeemScriptUtils.java
new file mode 100644
index 000000000..76938371c
--- /dev/null
+++ b/src/main/java/co/rsk/bitcoinj/script/RedeemScriptUtils.java
@@ -0,0 +1,39 @@
+package co.rsk.bitcoinj.script;
+
+import co.rsk.bitcoinj.core.ScriptException;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class RedeemScriptUtils {
+    private static final Logger logger = LoggerFactory.getLogger(RedeemScriptUtils.class);
+
+    private RedeemScriptUtils() { }
+    public static Optional<Script> extractRedeemScriptFromInputScript(Script inputScript) {
+        List<ScriptChunk> chunks = inputScript.getChunks();
+
+        if (chunks == null || chunks.isEmpty()) {
+            return Optional.empty();
+        }
+
+        byte[] program = chunks.get(chunks.size() - 1).data;
+        if (program == null) {
+            return Optional.empty();
+        }
+
+        try {
+            Script redeemScript = new Script(program);
+            return Optional.of(redeemScript);
+        } catch (ScriptException e) {
+            logger.debug(
+                "[extractRedeemScriptFromInput] Failed to extract redeem script from inputScript {}. {}",
+                inputScript,
+                e.getMessage()
+            );
+            return Optional.empty();
+        }
+    }
+}
diff --git a/src/main/java/co/rsk/bitcoinj/script/Script.java b/src/main/java/co/rsk/bitcoinj/script/Script.java
index 1cea8b02f..24617c3b7 100644
--- a/src/main/java/co/rsk/bitcoinj/script/Script.java
+++ b/src/main/java/co/rsk/bitcoinj/script/Script.java
@@ -20,6 +20,7 @@
 
 import static co.rsk.bitcoinj.script.ScriptOpCodes.*;
 import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
 
 import co.rsk.bitcoinj.core.Address;
 import co.rsk.bitcoinj.core.BtcECKey;
@@ -120,7 +121,6 @@ private Script() {
     Script(List<ScriptChunk> chunks) {
         this.chunks = Collections.unmodifiableList(new ArrayList<>(chunks));
         creationTimeSeconds = Utils.currentTimeSeconds();
-        redeemScriptParser = RedeemScriptParserFactory.get(this.chunks);
     }
 
     /**
@@ -132,15 +132,12 @@ public Script(byte[] programBytes) throws ScriptException {
         program = programBytes;
         parse(programBytes);
         creationTimeSeconds = 0;
-        redeemScriptParser = RedeemScriptParserFactory.get(this.chunks);
-
     }
 
     public Script(byte[] programBytes, long creationTimeSeconds) throws ScriptException {
         program = programBytes;
         parse(programBytes);
         this.creationTimeSeconds = creationTimeSeconds;
-        redeemScriptParser = RedeemScriptParserFactory.get(this.chunks);
     }
 
     public long getCreationTimeSeconds() {
@@ -485,24 +482,50 @@ public Script getScriptSigWithSignature(Script scriptSig, byte[] sigBytes, int i
         return ScriptBuilder.updateScriptWithSignature(scriptSig, sigBytes, index, sigsPrefixCount, sigsSuffixCount);
     }
 
+    private RedeemScriptParser getRedeemScriptParser() {
+        if (redeemScriptParser == null){
+            redeemScriptParser = RedeemScriptParserFactory.get(chunks);
+        }
+        return redeemScriptParser;
+    }
+
     /**
      * Returns the index where a signature by the key should be inserted. Only applicable to
      * a P2SH scriptSig.
      */
     public int getSigInsertionIndex(Sha256Hash hash, BtcECKey signingKey) {
-        return this.redeemScriptParser.getSigInsertionIndex(hash, signingKey);
+        // Iterate over existing signatures, skipping the initial OP_0, the final redeem script
+        // and any placeholder OP_0 sigs.
+        List<ScriptChunk> existingChunks = chunks.subList(1, chunks.size() - 1);
+        ScriptChunk redeemScriptChunk = chunks.get(chunks.size() - 1);
+        checkNotNull(redeemScriptChunk.data);
+        Script redeemScript = new Script(redeemScriptChunk.data);
+
+        int sigCount = 0;
+        int myIndex = redeemScript.findKeyInRedeem(signingKey);
+        for (ScriptChunk chunk : existingChunks) {
+            if (chunk.opcode != OP_0) {
+                checkNotNull(chunk.data);
+                if (myIndex < redeemScript.findSigInRedeem(chunk.data, hash)) {
+                    return sigCount;
+                }
+                sigCount++;
+            }
+        }
+
+        return sigCount;
     }
 
     public int findKeyInRedeem(BtcECKey key) {
-        return this.redeemScriptParser.findKeyInRedeem(key);
+        return this.getRedeemScriptParser().findKeyInRedeem(key);
     }
 
     public int findSigInRedeem(byte[] signatureBytes, Sha256Hash hash) {
-        return this.redeemScriptParser.findSigInRedeem(signatureBytes, hash);
+        return this.getRedeemScriptParser().findSigInRedeem(signatureBytes, hash);
     }
 
     public List<BtcECKey> getPubKeys() throws ScriptException {
-        return this.redeemScriptParser.getPubKeys();
+        return this.getRedeemScriptParser().getPubKeys();
     }
 
     ////////////////////// Interface used during verification of transactions/blocks ////////////////////////////////
@@ -591,7 +614,7 @@ public static long getP2SHSigOpCount(byte[] scriptSig) throws ScriptException {
     public int getNumberOfSignaturesRequiredToSpend() {
         if (this.isSentToMultiSig()) {
             // for M of N CHECKMULTISIG script we will need M signatures to spend
-            return redeemScriptParser.getM();
+            return this.getRedeemScriptParser().getM();
         } else if (isSentToAddress() || isSentToRawPubKey()) {
             // pay-to-address and pay-to-pubkey require single sig
             return 1;
@@ -654,7 +677,7 @@ public boolean isPayToScriptHash() {
      * Returns whether this script matches the format used for multisig outputs: [n] [keys...] [m] CHECKMULTISIG
      */
     public boolean isSentToMultiSig() {
-        return !redeemScriptParser.getMultiSigType().equals(MultiSigType.NO_MULTISIG_TYPE);
+        return !this.getRedeemScriptParser().getMultiSigType().equals(MultiSigType.NO_MULTISIG_TYPE);
     }
 
     public boolean isSentToCLTVPaymentChannel() {
diff --git a/src/main/java/co/rsk/bitcoinj/script/StandardRedeemScriptParser.java b/src/main/java/co/rsk/bitcoinj/script/StandardRedeemScriptParser.java
index 750a10846..5fcb846be 100644
--- a/src/main/java/co/rsk/bitcoinj/script/StandardRedeemScriptParser.java
+++ b/src/main/java/co/rsk/bitcoinj/script/StandardRedeemScriptParser.java
@@ -6,33 +6,21 @@
 import co.rsk.bitcoinj.core.Sha256Hash;
 import co.rsk.bitcoinj.core.Utils;
 import co.rsk.bitcoinj.crypto.TransactionSignature;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
 import java.util.List;
 
 public class StandardRedeemScriptParser implements RedeemScriptParser {
 
     protected MultiSigType multiSigType;
-    protected ScriptType scriptType;
-    // In case of P2SH represents a scriptSig, where the last chunk is the redeem script (either standard or extended)
-    protected List<ScriptChunk> rawChunks;
-    // Standard redeem script
     protected List<ScriptChunk> redeemScriptChunks;
 
     public StandardRedeemScriptParser(
-        ScriptType scriptType,
-        List<ScriptChunk> redeemScriptChunks,
-        List<ScriptChunk> rawChunks
+        List<ScriptChunk> redeemScriptChunks
     ) {
         this.multiSigType = MultiSigType.STANDARD_MULTISIG;
-        this.scriptType = scriptType;
         this.redeemScriptChunks = redeemScriptChunks;
-
-        this.rawChunks = Collections.unmodifiableList(new ArrayList<>(rawChunks));
     }
 
     @Override
@@ -40,43 +28,12 @@ public MultiSigType getMultiSigType() {
         return this.multiSigType;
     }
 
-    @Override
-    public ScriptType getScriptType() {
-        return this.scriptType;
-    }
-
     @Override
     public int getM() {
         checkArgument(redeemScriptChunks.get(0).isOpCode());
         return Script.decodeFromOpN(redeemScriptChunks.get(0).opcode);
     }
 
-    @Override
-    public int getSigInsertionIndex(Sha256Hash hash, BtcECKey signingKey) {
-        // Iterate over existing signatures, skipping the initial OP_0, the final redeem script
-        // and any placeholder OP_0 sigs.
-        List<ScriptChunk> existingChunks = rawChunks.subList(1, rawChunks.size() - 1);
-        Script redeemScript = new Script(this.redeemScriptChunks);
-
-        int sigCount = 0;
-        int myIndex = redeemScript.findKeyInRedeem(signingKey);
-        Iterator chunkIterator = existingChunks.iterator();
-
-        while(chunkIterator.hasNext()) {
-            ScriptChunk chunk = (ScriptChunk) chunkIterator.next();
-            if (chunk.opcode != 0) {
-                Preconditions.checkNotNull(chunk.data);
-                if (myIndex < redeemScript.findSigInRedeem(chunk.data, hash)) {
-                    return sigCount;
-                }
-
-                ++sigCount;
-            }
-        }
-
-        return sigCount;
-    }
-
     @Override
     public int findKeyInRedeem(BtcECKey key) {
         checkArgument(redeemScriptChunks.get(0).isOpCode()); // P2SH scriptSig
diff --git a/src/test/java/co/rsk/bitcoinj/script/ErpFederationRedeemScriptParserTest.java b/src/test/java/co/rsk/bitcoinj/script/ErpFederationRedeemScriptParserTest.java
index 63834cb1a..a5c420d81 100644
--- a/src/test/java/co/rsk/bitcoinj/script/ErpFederationRedeemScriptParserTest.java
+++ b/src/test/java/co/rsk/bitcoinj/script/ErpFederationRedeemScriptParserTest.java
@@ -16,18 +16,18 @@ public class ErpFederationRedeemScriptParserTest {
 
     @Before
     public void setUp() {
-        defaultRedeemScriptKeys = RedeemScriptUtils.getDefaultRedeemScriptKeys();
-        emergencyRedeemScriptKeys = RedeemScriptUtils.getEmergencyRedeemScriptKeys();
+        defaultRedeemScriptKeys = RedeemScriptTestUtils.getDefaultRedeemScriptKeys();
+        emergencyRedeemScriptKeys = RedeemScriptTestUtils.getEmergencyRedeemScriptKeys();
     }
 
     @Test
     public void extractStandardRedeemScript_fromErpRedeemScript() {
-        Script erpRedeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script erpRedeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             100L
         );
-        Script standardRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script standardRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys);
 
         Script obtainedRedeemScript = ErpFederationRedeemScriptParser.extractStandardRedeemScript(
@@ -39,7 +39,7 @@ public void extractStandardRedeemScript_fromErpRedeemScript() {
 
     @Test(expected = VerificationException.class)
     public void extractStandardRedeemScript_fromStandardRedeemScript_fail() {
-        Script standardRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script standardRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys);
 
         ErpFederationRedeemScriptParser.extractStandardRedeemScript(standardRedeemScript.getChunks());
@@ -47,10 +47,10 @@ public void extractStandardRedeemScript_fromStandardRedeemScript_fail() {
 
     @Test
     public void createErpRedeemScriptDeprecated() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = 300L;
@@ -66,10 +66,10 @@ public void createErpRedeemScriptDeprecated() {
 
     @Test(expected = VerificationException.class)
     public void createErpRedeemScriptDeprecated_invalidDefaultFederationRedeemScript() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createCustomRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createCustomRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = 200L;
@@ -83,10 +83,10 @@ public void createErpRedeemScriptDeprecated_invalidDefaultFederationRedeemScript
 
     @Test(expected = VerificationException.class)
     public void createErpRedeemScriptDeprecated_invalidErpFederationRedeemScript() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createCustomRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createCustomRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = 200L;
@@ -100,10 +100,10 @@ public void createErpRedeemScriptDeprecated_invalidErpFederationRedeemScript() {
 
     @Test(expected = VerificationException.class)
     public void createErpRedeemScriptDeprecated_csv_below_zero() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = -200L;
@@ -117,10 +117,10 @@ public void createErpRedeemScriptDeprecated_csv_below_zero() {
 
     @Test(expected = VerificationException.class)
     public void createErpRedeemScriptDeprecated_csv_above_max_value() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = ErpFederationRedeemScriptParser.MAX_CSV_VALUE + 1;
@@ -134,10 +134,10 @@ public void createErpRedeemScriptDeprecated_csv_above_max_value() {
 
     @Test
     public void createErpRedeemScriptDeprecated_csv_exact_max_value() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = ErpFederationRedeemScriptParser.MAX_CSV_VALUE;
@@ -153,10 +153,10 @@ public void createErpRedeemScriptDeprecated_csv_exact_max_value() {
 
     @Test
     public void createErpRedeemScriptDeprecated_csv_value_one_byte_long() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
 
@@ -174,10 +174,10 @@ public void createErpRedeemScriptDeprecated_csv_value_one_byte_long() {
 
     @Test
     public void createErpRedeemScript() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = 300L;
@@ -193,10 +193,10 @@ public void createErpRedeemScript() {
 
     @Test(expected = VerificationException.class)
     public void createErpRedeemScript_invalidDefaultFederationRedeemScript() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createCustomRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createCustomRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = 300L;
@@ -210,10 +210,10 @@ public void createErpRedeemScript_invalidDefaultFederationRedeemScript() {
 
     @Test(expected = VerificationException.class)
     public void createErpRedeemScript_invalidErpFederationRedeemScript() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createCustomRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createCustomRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = 300L;
@@ -227,10 +227,10 @@ public void createErpRedeemScript_invalidErpFederationRedeemScript() {
 
     @Test(expected = VerificationException.class)
     public void createErpRedeemScript_csv_negative_value() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = -100L;
@@ -244,10 +244,10 @@ public void createErpRedeemScript_csv_negative_value() {
 
     @Test(expected = VerificationException.class)
     public void createErpRedeemScript_csv_zero_value() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = 0L;
@@ -261,10 +261,10 @@ public void createErpRedeemScript_csv_zero_value() {
 
     @Test(expected = VerificationException.class)
     public void createErpRedeemScript_csv_above_max_value() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = ErpFederationRedeemScriptParser.MAX_CSV_VALUE + 1;
@@ -278,10 +278,10 @@ public void createErpRedeemScript_csv_above_max_value() {
 
     @Test
     public void createErpRedeemScript_csv_exact_max_value() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = ErpFederationRedeemScriptParser.MAX_CSV_VALUE;
@@ -297,10 +297,10 @@ public void createErpRedeemScript_csv_exact_max_value() {
 
     @Test
     public void createErpRedeemScript_csv_value_one_byte_long() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 20L;
@@ -316,10 +316,10 @@ public void createErpRedeemScript_csv_value_one_byte_long() {
 
     @Test
     public void createErpRedeemScript_csv_value_two_bytes_long() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 500L;
@@ -335,10 +335,10 @@ public void createErpRedeemScript_csv_value_two_bytes_long() {
 
     @Test
     public void createErpRedeemScript_csv_value_two_bytes_long_including_sign() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 130; // Any value above 127 needs an extra byte to indicate the sign
@@ -354,10 +354,10 @@ public void createErpRedeemScript_csv_value_two_bytes_long_including_sign() {
 
     @Test(expected = VerificationException.class)
     public void createErpRedeemScript_csv_value_three_bytes_long() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 100_000L;
@@ -372,10 +372,10 @@ public void createErpRedeemScript_csv_value_three_bytes_long() {
 
     @Test
     public void createErpRedeemScript_csv_value_three_bytes_long_including_sign() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 33_000L; // Any value above 32_767 needs an extra byte to indicate the sign
@@ -391,10 +391,10 @@ public void createErpRedeemScript_csv_value_three_bytes_long_including_sign() {
 
     @Test(expected = VerificationException.class)
     public void createErpRedeemScript_csv_value_four_bytes_long() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 10_000_000L;
@@ -409,10 +409,10 @@ public void createErpRedeemScript_csv_value_four_bytes_long() {
 
     @Test(expected = VerificationException.class)
     public void createErpRedeemScript_csv_value_four_bytes_long_including_sign() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 8_400_000L; // Any value above 8_388_607 needs an extra byte to indicate the sign
@@ -427,7 +427,7 @@ public void createErpRedeemScript_csv_value_four_bytes_long_including_sign() {
 
     @Test
     public void isErpFed() {
-        Script erpRedeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script erpRedeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             200L
@@ -438,7 +438,7 @@ public void isErpFed() {
 
     @Test
     public void isErpFed_falseWithCustomRedeemScript() {
-        Script customRedeemScript = RedeemScriptUtils.createCustomRedeemScript(
+        Script customRedeemScript = RedeemScriptTestUtils.createCustomRedeemScript(
             defaultRedeemScriptKeys
         );
 
diff --git a/src/test/java/co/rsk/bitcoinj/script/FastBridgeErpRedeemScriptParserTest.java b/src/test/java/co/rsk/bitcoinj/script/FastBridgeErpRedeemScriptParserTest.java
index c2f4b875c..2d9bb1dc6 100644
--- a/src/test/java/co/rsk/bitcoinj/script/FastBridgeErpRedeemScriptParserTest.java
+++ b/src/test/java/co/rsk/bitcoinj/script/FastBridgeErpRedeemScriptParserTest.java
@@ -15,22 +15,22 @@ public class FastBridgeErpRedeemScriptParserTest {
 
     @Before
     public void setUp() {
-        defaultRedeemScriptKeys = RedeemScriptUtils.getDefaultRedeemScriptKeys();
-        emergencyRedeemScriptKeys = RedeemScriptUtils.getEmergencyRedeemScriptKeys();
+        defaultRedeemScriptKeys = RedeemScriptTestUtils.getDefaultRedeemScriptKeys();
+        emergencyRedeemScriptKeys = RedeemScriptTestUtils.getEmergencyRedeemScriptKeys();
     }
 
     @Test
     public void extractStandardRedeemScript_fromFastBridgeErpRedeemScript() {
         Long csvValue = 100L;
         Sha256Hash derivationArgumentsHash = Sha256Hash.of(new byte[]{1});
-        Script fastBridgeErpRedeemScript = RedeemScriptUtils.createFastBridgeErpRedeemScript(
+        Script fastBridgeErpRedeemScript = RedeemScriptTestUtils.createFastBridgeErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             csvValue,
             derivationArgumentsHash.getBytes()
         );
 
-        Script standardRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script standardRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys);
 
         Script obtainedRedeemScript = FastBridgeErpRedeemScriptParser.extractStandardRedeemScript(
@@ -42,7 +42,7 @@ public void extractStandardRedeemScript_fromFastBridgeErpRedeemScript() {
 
     @Test(expected = VerificationException.class)
     public void extractStandardRedeemScript_fromStandardRedeemScript_fail() {
-        Script standardRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script standardRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys);
 
         FastBridgeErpRedeemScriptParser.extractStandardRedeemScript(standardRedeemScript.getChunks());
@@ -50,7 +50,7 @@ public void extractStandardRedeemScript_fromStandardRedeemScript_fail() {
 
     @Test
     public void createFastBridgeErpRedeemScript_from_Erp_redeem_script() {
-        Script erpRedeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script erpRedeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             5063L
@@ -58,7 +58,7 @@ public void createFastBridgeErpRedeemScript_from_Erp_redeem_script() {
 
         Sha256Hash derivationArgumentsHash = Sha256Hash.of(new byte[]{1});
 
-        Script expectedRedeemScript = RedeemScriptUtils.createFastBridgeErpRedeemScript(
+        Script expectedRedeemScript = RedeemScriptTestUtils.createFastBridgeErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             5063L,
@@ -75,7 +75,7 @@ public void createFastBridgeErpRedeemScript_from_Erp_redeem_script() {
 
     @Test
     public void isFastBridgeErpFed() {
-        Script fastBridgeErpRedeemScript = RedeemScriptUtils.createFastBridgeErpRedeemScript(
+        Script fastBridgeErpRedeemScript = RedeemScriptTestUtils.createFastBridgeErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             200L,
@@ -87,7 +87,7 @@ public void isFastBridgeErpFed() {
 
     @Test
     public void isFastBridgeErpFed_falseWithCustomRedeemScript() {
-        Script customRedeemScript = RedeemScriptUtils.createCustomRedeemScript(
+        Script customRedeemScript = RedeemScriptTestUtils.createCustomRedeemScript(
             defaultRedeemScriptKeys);
 
         Assert.assertFalse(FastBridgeErpRedeemScriptParser.isFastBridgeErpFed(customRedeemScript.getChunks()));
diff --git a/src/test/java/co/rsk/bitcoinj/script/FastBridgeP2shErpRedeemScriptParserTest.java b/src/test/java/co/rsk/bitcoinj/script/FastBridgeP2shErpRedeemScriptParserTest.java
index 1c864eee4..5a20352f1 100644
--- a/src/test/java/co/rsk/bitcoinj/script/FastBridgeP2shErpRedeemScriptParserTest.java
+++ b/src/test/java/co/rsk/bitcoinj/script/FastBridgeP2shErpRedeemScriptParserTest.java
@@ -24,22 +24,22 @@ public class FastBridgeP2shErpRedeemScriptParserTest {
 
     @Before
     public void setUp() {
-        defaultRedeemScriptKeys = RedeemScriptUtils.getDefaultRedeemScriptKeys();
-        emergencyRedeemScriptKeys = RedeemScriptUtils.getEmergencyRedeemScriptKeys();
+        defaultRedeemScriptKeys = RedeemScriptTestUtils.getDefaultRedeemScriptKeys();
+        emergencyRedeemScriptKeys = RedeemScriptTestUtils.getEmergencyRedeemScriptKeys();
     }
 
     @Test
     public void extractStandardRedeemScript_fromFastBridgeP2shErpRedeemScript() {
         Long csvValue = 100L;
         Sha256Hash derivationArgumentsHash = Sha256Hash.of(new byte[]{1});
-        Script fastBridgeP2shErpRedeemScript = RedeemScriptUtils.createFastBridgeP2shErpRedeemScript(
+        Script fastBridgeP2shErpRedeemScript = RedeemScriptTestUtils.createFastBridgeP2shErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             csvValue,
             derivationArgumentsHash.getBytes()
         );
 
-        Script standardRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script standardRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
 
@@ -52,7 +52,7 @@ public void extractStandardRedeemScript_fromFastBridgeP2shErpRedeemScript() {
 
     @Test(expected = VerificationException.class)
     public void extractStandardRedeemScript_fromStandardRedeemScript_fail() {
-        Script standardRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script standardRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
 
@@ -61,7 +61,7 @@ public void extractStandardRedeemScript_fromStandardRedeemScript_fail() {
 
     @Test
     public void createFastBridgeP2shErpRedeemScript_fromP2shErpRedeemScript() {
-        Script erpRedeemScript = RedeemScriptUtils.createP2shErpRedeemScript(
+        Script erpRedeemScript = RedeemScriptTestUtils.createP2shErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             5063L
@@ -69,7 +69,7 @@ public void createFastBridgeP2shErpRedeemScript_fromP2shErpRedeemScript() {
 
         Sha256Hash derivationArgumentsHash = Sha256Hash.of(new byte[]{1});
 
-        Script expectedRedeemScript = RedeemScriptUtils.createFastBridgeP2shErpRedeemScript(
+        Script expectedRedeemScript = RedeemScriptTestUtils.createFastBridgeP2shErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             5063L,
@@ -86,7 +86,7 @@ public void createFastBridgeP2shErpRedeemScript_fromP2shErpRedeemScript() {
 
     @Test
     public void isFastBridgeP2shErpFed() {
-        Script fastBridgeP2shErpRedeemScript = RedeemScriptUtils.createFastBridgeP2shErpRedeemScript(
+        Script fastBridgeP2shErpRedeemScript = RedeemScriptTestUtils.createFastBridgeP2shErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             200L,
@@ -100,7 +100,7 @@ public void isFastBridgeP2shErpFed() {
 
     @Test
     public void isFastBridgeP2shErpFed_falseWithFastBridgeErpFed() {
-        Script fastBridgeErpRedeemScript = RedeemScriptUtils.createFastBridgeErpRedeemScript(
+        Script fastBridgeErpRedeemScript = RedeemScriptTestUtils.createFastBridgeErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             200L,
@@ -114,7 +114,7 @@ public void isFastBridgeP2shErpFed_falseWithFastBridgeErpFed() {
 
     @Test
     public void isFastBridgeP2shErpFed_falseWithCustomRedeemScript() {
-        Script customRedeemScript = RedeemScriptUtils.createCustomRedeemScript(
+        Script customRedeemScript = RedeemScriptTestUtils.createCustomRedeemScript(
             defaultRedeemScriptKeys
         );
 
diff --git a/src/test/java/co/rsk/bitcoinj/script/FastBridgeRedeemScriptParserTest.java b/src/test/java/co/rsk/bitcoinj/script/FastBridgeRedeemScriptParserTest.java
index 1ff8611fa..7af6760e9 100644
--- a/src/test/java/co/rsk/bitcoinj/script/FastBridgeRedeemScriptParserTest.java
+++ b/src/test/java/co/rsk/bitcoinj/script/FastBridgeRedeemScriptParserTest.java
@@ -14,18 +14,18 @@ public class FastBridgeRedeemScriptParserTest {
 
     @Before
     public void setUp() {
-        publicKeys = RedeemScriptUtils.getDefaultRedeemScriptKeys();
+        publicKeys = RedeemScriptTestUtils.getDefaultRedeemScriptKeys();
     }
 
     @Test
     public void extractRedeemScriptFromMultiSigFastBridgeRedeemScript_fb_redeem_script() {
         byte[] data = Sha256Hash.of(new byte[]{1}).getBytes();
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             data,
             publicKeys
         );
 
-        Script standardRedeemScript = RedeemScriptUtils.createStandardRedeemScript(publicKeys);
+        Script standardRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(publicKeys);
 
         Script obtainedRedeemScript = FastBridgeRedeemScriptParser.extractStandardRedeemScript(
             fastBridgeRedeemScript
@@ -36,7 +36,7 @@ public void extractRedeemScriptFromMultiSigFastBridgeRedeemScript_fb_redeem_scri
 
     @Test
     public void extractRedeemScriptFromMultiSigFastBridgeRedeemScript_std_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(publicKeys);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(publicKeys);
         Script obtainedRedeemScript = FastBridgeRedeemScriptParser.extractStandardRedeemScript(redeemScript);
 
         Assert.assertEquals(redeemScript, obtainedRedeemScript);
@@ -44,10 +44,10 @@ public void extractRedeemScriptFromMultiSigFastBridgeRedeemScript_std_redeem_scr
 
     @Test
     public void createMultiSigFastBridgeRedeemScript_valid_parameters() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(publicKeys);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(publicKeys);
         Sha256Hash derivationArgumentsHash = Sha256Hash.of(new byte[]{1});
 
-        Script expectedFastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script expectedFastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             derivationArgumentsHash.getBytes(),
             publicKeys
         );
@@ -62,7 +62,7 @@ public void createMultiSigFastBridgeRedeemScript_valid_parameters() {
     @Test(expected = VerificationException.class)
     public void createMultiSigFastBridgeRedeemScript_fb_redeem_script() {
         Sha256Hash data = Sha256Hash.of(new byte[]{1});
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             data.getBytes(),
             publicKeys
         );
@@ -72,20 +72,20 @@ public void createMultiSigFastBridgeRedeemScript_fb_redeem_script() {
 
     @Test(expected = VerificationException.class)
     public void createMultiSigFastBridgeRedeemScript_null_derivation_arguments_hash() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(publicKeys);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(publicKeys);
         FastBridgeRedeemScriptParser.createMultiSigFastBridgeRedeemScript(redeemScript, null);
     }
 
     @Test(expected = VerificationException.class)
     public void createMultiSigFastBridgeRedeemScript_zero_hash_as_derivation_arguments_hash() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(publicKeys);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(publicKeys);
         FastBridgeRedeemScriptParser.createMultiSigFastBridgeRedeemScript(redeemScript, Sha256Hash.ZERO_HASH);
     }
 
     @Test
     public void getDerivationArgumentsHash_from_fast_bridge_multiSig() {
         byte[] data = Sha256Hash.of(new byte[]{1}).getBytes();
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             data,
             publicKeys
         );
@@ -99,7 +99,7 @@ public void getDerivationArgumentsHash_from_fast_bridge_multiSig() {
     @Test
     public void isFastBridgeMultisig() {
         Sha256Hash derivationArgumentsHash = Sha256Hash.of(new byte[]{1});
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             derivationArgumentsHash.getBytes(),
             publicKeys
         );
@@ -109,7 +109,7 @@ public void isFastBridgeMultisig() {
 
     @Test
     public void isFastBridgeMultisig_falseWithCustomRedeemScrip() {
-        Script customRedeemScript = RedeemScriptUtils.createCustomRedeemScript(publicKeys);
+        Script customRedeemScript = RedeemScriptTestUtils.createCustomRedeemScript(publicKeys);
 
         Assert.assertFalse(FastBridgeRedeemScriptParser.isFastBridgeMultiSig(customRedeemScript.getChunks()));
     }
diff --git a/src/test/java/co/rsk/bitcoinj/script/P2shErpFederationRedeemScriptParserTest.java b/src/test/java/co/rsk/bitcoinj/script/P2shErpFederationRedeemScriptParserTest.java
index a6b0f1771..7259967ce 100644
--- a/src/test/java/co/rsk/bitcoinj/script/P2shErpFederationRedeemScriptParserTest.java
+++ b/src/test/java/co/rsk/bitcoinj/script/P2shErpFederationRedeemScriptParserTest.java
@@ -15,18 +15,18 @@ public class P2shErpFederationRedeemScriptParserTest {
 
     @Before
     public void setUp() {
-        defaultRedeemScriptKeys = RedeemScriptUtils.getDefaultRedeemScriptKeys();
-        emergencyRedeemScriptKeys = RedeemScriptUtils.getEmergencyRedeemScriptKeys();
+        defaultRedeemScriptKeys = RedeemScriptTestUtils.getDefaultRedeemScriptKeys();
+        emergencyRedeemScriptKeys = RedeemScriptTestUtils.getEmergencyRedeemScriptKeys();
     }
 
     @Test
     public void extractStandardRedeemScript_fromP2shErpRedeemScript() {
-        Script erpRedeemScript = RedeemScriptUtils.createP2shErpRedeemScript(
+        Script erpRedeemScript = RedeemScriptTestUtils.createP2shErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             100L
         );
-        Script standardRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script standardRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
 
@@ -39,7 +39,7 @@ public void extractStandardRedeemScript_fromP2shErpRedeemScript() {
 
     @Test(expected = VerificationException.class)
     public void extractStandardRedeemScript_fromStandardRedeemScript_fail() {
-        Script standardRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script standardRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
 
@@ -48,10 +48,10 @@ public void extractStandardRedeemScript_fromStandardRedeemScript_fail() {
 
     @Test
     public void createP2shErpRedeemScript() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = 300L;
@@ -67,10 +67,10 @@ public void createP2shErpRedeemScript() {
 
     @Test(expected = VerificationException.class)
     public void createP2shErpRedeemScript_invalidDefaultFederationRedeemScript() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createCustomRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createCustomRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = 300L;
@@ -84,10 +84,10 @@ public void createP2shErpRedeemScript_invalidDefaultFederationRedeemScript() {
 
     @Test(expected = VerificationException.class)
     public void createP2shErpRedeemScript_invalidErpFederationRedeemScript() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createCustomRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createCustomRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = 300L;
@@ -101,10 +101,10 @@ public void createP2shErpRedeemScript_invalidErpFederationRedeemScript() {
 
     @Test(expected = VerificationException.class)
     public void createP2shErpRedeemScript_csv_negative_value() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = -100L;
@@ -118,10 +118,10 @@ public void createP2shErpRedeemScript_csv_negative_value() {
 
     @Test(expected = VerificationException.class)
     public void createP2shErpRedeemScript_csv_zero_value() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = 0L;
@@ -135,10 +135,10 @@ public void createP2shErpRedeemScript_csv_zero_value() {
 
     @Test(expected = VerificationException.class)
     public void createP2shErpRedeemScript_csv_above_max_value() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = P2shErpFederationRedeemScriptParser.MAX_CSV_VALUE + 1;
@@ -152,10 +152,10 @@ public void createP2shErpRedeemScript_csv_above_max_value() {
 
     @Test
     public void createP2shErpRedeemScript_csv_exact_max_value() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         Long csvValue = P2shErpFederationRedeemScriptParser.MAX_CSV_VALUE;
@@ -171,10 +171,10 @@ public void createP2shErpRedeemScript_csv_exact_max_value() {
 
     @Test
     public void createP2shErpRedeemScript_csv_value_one_byte_long() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 20L;
@@ -190,10 +190,10 @@ public void createP2shErpRedeemScript_csv_value_one_byte_long() {
 
     @Test
     public void createP2shErpRedeemScript_csv_value_two_bytes_long() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 500L;
@@ -209,10 +209,10 @@ public void createP2shErpRedeemScript_csv_value_two_bytes_long() {
 
     @Test
     public void createP2shErpRedeemScript_csv_value_two_bytes_long_including_sign() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 130; // Any value above 127 needs an extra byte to indicate the sign
@@ -228,10 +228,10 @@ public void createP2shErpRedeemScript_csv_value_two_bytes_long_including_sign()
 
     @Test(expected = VerificationException.class)
     public void createP2shErpRedeemScript_csv_value_three_bytes_long() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 100_000L;
@@ -246,10 +246,10 @@ public void createP2shErpRedeemScript_csv_value_three_bytes_long() {
 
     @Test
     public void createP2shErpRedeemScript_csv_value_three_bytes_long_including_sign() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 33_000L; // Any value above 32_767 needs an extra byte to indicate the sign
@@ -265,10 +265,10 @@ public void createP2shErpRedeemScript_csv_value_three_bytes_long_including_sign(
 
     @Test(expected = VerificationException.class)
     public void createP2shErpRedeemScript_csv_value_four_bytes_long() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 10_000_000L;
@@ -283,10 +283,10 @@ public void createP2shErpRedeemScript_csv_value_four_bytes_long() {
 
     @Test(expected = VerificationException.class)
     public void createP2shErpRedeemScript_csv_value_four_bytes_long_including_sign() {
-        Script defaultFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script defaultFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             defaultRedeemScriptKeys
         );
-        Script erpFederationRedeemScript = RedeemScriptUtils.createStandardRedeemScript(
+        Script erpFederationRedeemScript = RedeemScriptTestUtils.createStandardRedeemScript(
             emergencyRedeemScriptKeys
         );
         long csvValue = 8_400_000L; // Any value above 8_388_607 needs an extra byte to indicate the sign
@@ -301,7 +301,7 @@ public void createP2shErpRedeemScript_csv_value_four_bytes_long_including_sign()
 
     @Test
     public void isP2shErpFed() {
-        Script erpRedeemScript = RedeemScriptUtils.createP2shErpRedeemScript(
+        Script erpRedeemScript = RedeemScriptTestUtils.createP2shErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             200L
@@ -312,7 +312,7 @@ public void isP2shErpFed() {
 
     @Test
     public void isErpFed_falseWithP2shErpRedeemScript() {
-        Script erpRedeemScript = RedeemScriptUtils.createP2shErpRedeemScript(
+        Script erpRedeemScript = RedeemScriptTestUtils.createP2shErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             200L
@@ -323,7 +323,7 @@ public void isErpFed_falseWithP2shErpRedeemScript() {
 
     @Test
     public void isP2shErpFed_falseWithCustomRedeemScript() {
-        Script customRedeemScript = RedeemScriptUtils.createCustomRedeemScript(
+        Script customRedeemScript = RedeemScriptTestUtils.createCustomRedeemScript(
             defaultRedeemScriptKeys
         );
 
diff --git a/src/test/java/co/rsk/bitcoinj/script/RedeemScriptParserFactoryTest.java b/src/test/java/co/rsk/bitcoinj/script/RedeemScriptParserFactoryTest.java
index eb3bd653b..b17c5c960 100644
--- a/src/test/java/co/rsk/bitcoinj/script/RedeemScriptParserFactoryTest.java
+++ b/src/test/java/co/rsk/bitcoinj/script/RedeemScriptParserFactoryTest.java
@@ -4,7 +4,6 @@
 import co.rsk.bitcoinj.core.Sha256Hash;
 import co.rsk.bitcoinj.core.Utils;
 import co.rsk.bitcoinj.script.RedeemScriptParser.MultiSigType;
-import co.rsk.bitcoinj.script.RedeemScriptParser.ScriptType;
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.List;
@@ -12,6 +11,8 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import static co.rsk.bitcoinj.script.RedeemScriptUtils.extractRedeemScriptFromInputScript;
+
 public class RedeemScriptParserFactoryTest {
 
     private List<BtcECKey> defaultRedeemScriptKeys;
@@ -23,35 +24,33 @@ public class RedeemScriptParserFactoryTest {
 
     @Before
     public void setUp() {
-        defaultRedeemScriptKeys = RedeemScriptUtils.getDefaultRedeemScriptKeys();
-        emergencyRedeemScriptKeys = RedeemScriptUtils.getEmergencyRedeemScriptKeys();
+        defaultRedeemScriptKeys = RedeemScriptTestUtils.getDefaultRedeemScriptKeys();
+        emergencyRedeemScriptKeys = RedeemScriptTestUtils.getEmergencyRedeemScriptKeys();
     }
 
     @Test
     public void create_RedeemScriptParser_object_from_fast_bridge_multiSig_chunk() {
         byte[] data = Sha256Hash.of(new byte[]{1}).getBytes();
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             data,
             defaultRedeemScriptKeys
         );
 
         RedeemScriptParser parser = RedeemScriptParserFactory.get(fastBridgeRedeemScript.getChunks());
         Assert.assertEquals(MultiSigType.FAST_BRIDGE_MULTISIG, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.REDEEM_SCRIPT, parser.getScriptType());
     }
 
     @Test
     public void create_RedeemScriptParser_object_from_standard_multiSig_chunk() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(defaultRedeemScriptKeys);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(defaultRedeemScriptKeys);
         RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScript.getChunks());
 
         Assert.assertEquals(MultiSigType.STANDARD_MULTISIG, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.REDEEM_SCRIPT, parser.getScriptType());
     }
 
     @Test
     public void create_RedeemScriptParser_object_from_erp_multiSig_chunk() {
-        Script redeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             500L
@@ -60,12 +59,11 @@ public void create_RedeemScriptParser_object_from_erp_multiSig_chunk() {
         RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScript.getChunks());
 
         Assert.assertEquals(MultiSigType.ERP_FED, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.REDEEM_SCRIPT, parser.getScriptType());
     }
 
     @Test
     public void create_RedeemScriptParser_object_from_erp_fast_bridge_multiSig_chunk() {
-        Script redeemScript = RedeemScriptUtils.createFastBridgeErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createFastBridgeErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             500L,
@@ -75,12 +73,11 @@ public void create_RedeemScriptParser_object_from_erp_fast_bridge_multiSig_chunk
         RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScript.getChunks());
 
         Assert.assertEquals(MultiSigType.FAST_BRIDGE_ERP_FED, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.REDEEM_SCRIPT, parser.getScriptType());
     }
 
     @Test
     public void create_RedeemScriptParser_object_from_p2sh_erp_multiSig_chunk() {
-        Script redeemScript = RedeemScriptUtils.createP2shErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createP2shErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             500L
@@ -89,12 +86,11 @@ public void create_RedeemScriptParser_object_from_p2sh_erp_multiSig_chunk() {
         RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScript.getChunks());
 
         Assert.assertEquals(MultiSigType.P2SH_ERP_FED, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.REDEEM_SCRIPT, parser.getScriptType());
     }
 
     @Test
     public void create_RedeemScriptParser_object_from_fast_bridge_p2sh_erp_multiSig_chunk() {
-        Script redeemScript = RedeemScriptUtils.createFastBridgeP2shErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createFastBridgeP2shErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             500L,
@@ -104,13 +100,12 @@ public void create_RedeemScriptParser_object_from_fast_bridge_p2sh_erp_multiSig_
         RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScript.getChunks());
 
         Assert.assertEquals(MultiSigType.FAST_BRIDGE_P2SH_ERP_FED, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.REDEEM_SCRIPT, parser.getScriptType());
     }
 
     @Test
     public void create_RedeemScriptParser_object_from_fast_bridge_P2SH_chunk() {
         byte[] data = Sha256Hash.of(new byte[]{1}).getBytes();
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             data,
             defaultRedeemScriptKeys
         );
@@ -121,15 +116,15 @@ public void create_RedeemScriptParser_object_from_fast_bridge_P2SH_chunk() {
         );
 
         Script inputScript = spk.createEmptyInputScript(null, fastBridgeRedeemScript);
-        RedeemScriptParser parser = RedeemScriptParserFactory.get(inputScript.getChunks());
+        Script redeemScriptFromInputScript = extractRedeemScriptFromInputScript(inputScript).get();
+        RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScriptFromInputScript.getChunks());
 
         Assert.assertEquals(MultiSigType.FAST_BRIDGE_MULTISIG, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.P2SH, parser.getScriptType());
     }
 
     @Test
     public void create_RedeemScriptParser_object_from_standard_P2SH_chunk() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(defaultRedeemScriptKeys);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(defaultRedeemScriptKeys);
 
         Script spk = ScriptBuilder.createP2SHOutputScript(
             2,
@@ -137,15 +132,15 @@ public void create_RedeemScriptParser_object_from_standard_P2SH_chunk() {
         );
 
         Script inputScript = spk.createEmptyInputScript(null, redeemScript);
-        RedeemScriptParser parser = RedeemScriptParserFactory.get(inputScript.getChunks());
+        Script redeemScriptFromInputScript = extractRedeemScriptFromInputScript(inputScript).get();
+        RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScriptFromInputScript.getChunks());
 
         Assert.assertEquals(MultiSigType.STANDARD_MULTISIG, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.P2SH, parser.getScriptType());
     }
 
     @Test
     public void create_RedeemScriptParser_object_from_erp_P2SH_chunk() {
-        Script erpRedeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script erpRedeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             500L
@@ -157,15 +152,15 @@ public void create_RedeemScriptParser_object_from_erp_P2SH_chunk() {
         );
 
         Script inputScript = spk.createEmptyInputScript(null, erpRedeemScript);
-        RedeemScriptParser parser = RedeemScriptParserFactory.get(inputScript.getChunks());
+        Script redeemScriptFromInputScript = extractRedeemScriptFromInputScript(inputScript).get();
+        RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScriptFromInputScript.getChunks());
 
         Assert.assertEquals(MultiSigType.ERP_FED, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.P2SH, parser.getScriptType());
     }
 
     @Test
     public void create_RedeemScriptParser_object_from_fast_bridge_erp_P2SH_chunk() {
-        Script fastBridgeErpRedeemScript = RedeemScriptUtils.createFastBridgeErpRedeemScript(
+        Script fastBridgeErpRedeemScript = RedeemScriptTestUtils.createFastBridgeErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             500L,
@@ -178,15 +173,15 @@ public void create_RedeemScriptParser_object_from_fast_bridge_erp_P2SH_chunk() {
         );
 
         Script inputScript = spk.createEmptyInputScript(null, fastBridgeErpRedeemScript);
-        RedeemScriptParser parser = RedeemScriptParserFactory.get(inputScript.getChunks());
+        Script redeemScriptFromInputScript = extractRedeemScriptFromInputScript(inputScript).get();
+        RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScriptFromInputScript.getChunks());
 
         Assert.assertEquals(MultiSigType.FAST_BRIDGE_ERP_FED, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.P2SH, parser.getScriptType());
     }
 
     @Test
     public void create_RedeemScriptParser_object_from_p2sh_erp_P2SH_chunk() {
-        Script p2shErpRedeemScript = RedeemScriptUtils.createP2shErpRedeemScript(
+        Script p2shErpRedeemScript = RedeemScriptTestUtils.createP2shErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             500L
@@ -198,15 +193,15 @@ public void create_RedeemScriptParser_object_from_p2sh_erp_P2SH_chunk() {
         );
 
         Script inputScript = spk.createEmptyInputScript(null, p2shErpRedeemScript);
-        RedeemScriptParser parser = RedeemScriptParserFactory.get(inputScript.getChunks());
+        Script redeemScriptFromInputScript = extractRedeemScriptFromInputScript(inputScript).get();
+        RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScriptFromInputScript.getChunks());
 
         Assert.assertEquals(MultiSigType.P2SH_ERP_FED, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.P2SH, parser.getScriptType());
     }
 
     @Test
     public void create_RedeemScriptParser_object_from_fast_bridge_p2sh_erp_P2SH_chunk() {
-        Script fastBridgeP2shErpRedeemScript = RedeemScriptUtils.createFastBridgeP2shErpRedeemScript(
+        Script fastBridgeP2shErpRedeemScript = RedeemScriptTestUtils.createFastBridgeP2shErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             500L,
@@ -219,15 +214,15 @@ public void create_RedeemScriptParser_object_from_fast_bridge_p2sh_erp_P2SH_chun
         );
 
         Script inputScript = spk.createEmptyInputScript(null, fastBridgeP2shErpRedeemScript);
-        RedeemScriptParser parser = RedeemScriptParserFactory.get(inputScript.getChunks());
+        Script redeemScriptFromInputScript = extractRedeemScriptFromInputScript(inputScript).get();
+        RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScriptFromInputScript.getChunks());
 
         Assert.assertEquals(MultiSigType.FAST_BRIDGE_P2SH_ERP_FED, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.P2SH, parser.getScriptType());
     }
 
     @Test
     public void create_RedeemScriptParser_object_from_custom_redeem_script_no_multiSig() {
-        Script redeemScript = RedeemScriptUtils.createCustomRedeemScript(defaultRedeemScriptKeys);
+        Script redeemScript = RedeemScriptTestUtils.createCustomRedeemScript(defaultRedeemScriptKeys);
         RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScript.getChunks());
 
         Assert.assertEquals(MultiSigType.NO_MULTISIG_TYPE, parser.getMultiSigType());
@@ -239,7 +234,6 @@ public void create_RedeemScriptParser_object_from_custom_redeem_script_insuffici
         RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScript.getChunks());
 
         Assert.assertEquals(MultiSigType.NO_MULTISIG_TYPE, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.UNDEFINED, parser.getScriptType());
     }
 
     @Test
@@ -250,6 +244,5 @@ public void create_RedeemScriptParser_object_from_hardcoded_testnet_redeem_scrip
         RedeemScriptParser parser = RedeemScriptParserFactory.get(erpTestnetRedeemScript.getChunks());
 
         Assert.assertEquals(MultiSigType.NO_MULTISIG_TYPE, parser.getMultiSigType());
-        Assert.assertEquals(ScriptType.UNDEFINED, parser.getScriptType());
     }
 }
diff --git a/src/test/java/co/rsk/bitcoinj/script/RedeemScriptUtils.java b/src/test/java/co/rsk/bitcoinj/script/RedeemScriptTestUtils.java
similarity index 99%
rename from src/test/java/co/rsk/bitcoinj/script/RedeemScriptUtils.java
rename to src/test/java/co/rsk/bitcoinj/script/RedeemScriptTestUtils.java
index ccf2b0f3e..96e02ec9d 100644
--- a/src/test/java/co/rsk/bitcoinj/script/RedeemScriptUtils.java
+++ b/src/test/java/co/rsk/bitcoinj/script/RedeemScriptTestUtils.java
@@ -8,7 +8,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class RedeemScriptUtils {
+public class RedeemScriptTestUtils {
 
     protected static Script createStandardRedeemScript(List<BtcECKey> publicKeys) {
         return ScriptBuilder.createRedeemScript(publicKeys.size() / 2 + 1, publicKeys);
diff --git a/src/test/java/co/rsk/bitcoinj/script/RedeemScriptValidatorTest.java b/src/test/java/co/rsk/bitcoinj/script/RedeemScriptValidatorTest.java
index e0ec41c6b..3526ac636 100644
--- a/src/test/java/co/rsk/bitcoinj/script/RedeemScriptValidatorTest.java
+++ b/src/test/java/co/rsk/bitcoinj/script/RedeemScriptValidatorTest.java
@@ -20,14 +20,14 @@ public class RedeemScriptValidatorTest {
 
     @Before
     public void setUp() {
-        defaultRedeemScriptKeys = RedeemScriptUtils.getDefaultRedeemScriptKeys();
-        emergencyRedeemScriptKeys = RedeemScriptUtils.getEmergencyRedeemScriptKeys();
+        defaultRedeemScriptKeys = RedeemScriptTestUtils.getDefaultRedeemScriptKeys();
+        emergencyRedeemScriptKeys = RedeemScriptTestUtils.getEmergencyRedeemScriptKeys();
     }
 
     @Test
     public void isRedeemLikeScript_invalid_redeem_script_missing_checkSig() {
         List<ScriptChunk> chunksWithoutCheckSig = RedeemScriptValidator.removeOpCheckMultisig(
-            RedeemScriptUtils.createStandardRedeemScript(defaultRedeemScriptKeys)
+            RedeemScriptTestUtils.createStandardRedeemScript(defaultRedeemScriptKeys)
         );
 
         Assert.assertFalse(RedeemScriptValidator.isRedeemLikeScript(chunksWithoutCheckSig));
@@ -47,13 +47,13 @@ public void isRedeemLikeScript_invalid_redeem_script_insufficient_chunks() {
 
     @Test
     public void hasStandardRedeemScriptStructure_standard_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(defaultRedeemScriptKeys);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(defaultRedeemScriptKeys);
         Assert.assertTrue(RedeemScriptValidator.hasStandardRedeemScriptStructure(redeemScript.getChunks()));
     }
 
     @Test
     public void hasStandardRedeemScriptStructure_non_standard_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             500L
@@ -64,13 +64,13 @@ public void hasStandardRedeemScriptStructure_non_standard_redeem_script() {
 
     @Test
     public void hasErpRedeemScriptStructure_standard_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(defaultRedeemScriptKeys);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(defaultRedeemScriptKeys);
         Assert.assertFalse(RedeemScriptValidator.hasErpRedeemScriptStructure(redeemScript.getChunks()));
     }
 
     @Test
     public void hasErpRedeemScriptStructure_fast_bridge_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             Sha256Hash.of(new byte[]{1}).getBytes(),
             defaultRedeemScriptKeys
         );
@@ -80,7 +80,7 @@ public void hasErpRedeemScriptStructure_fast_bridge_redeem_script() {
 
     @Test
     public void hasErpRedeemScriptStructure_erp_fed_redeem_script_one_byte_csv_value() {
-        Script redeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             10L
@@ -91,7 +91,7 @@ public void hasErpRedeemScriptStructure_erp_fed_redeem_script_one_byte_csv_value
 
     @Test
     public void hasErpRedeemScriptStructure_erp_fed_redeem_script_two_bytes_csv_value() {
-        Script redeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             500L
@@ -102,7 +102,7 @@ public void hasErpRedeemScriptStructure_erp_fed_redeem_script_two_bytes_csv_valu
 
     @Test
     public void hasErpRedeemScriptStructure_erp_fed_redeem_script_two_bytes_including_sign_csv_value() {
-        Script redeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             130L // Any value above 127 needs an extra byte to indicate the sign
@@ -113,7 +113,7 @@ public void hasErpRedeemScriptStructure_erp_fed_redeem_script_two_bytes_includin
 
     @Test
     public void hasErpRedeemScriptStructure_erp_fed_redeem_script_three_bytes_csv_value() {
-        Script redeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             100_000L
@@ -124,7 +124,7 @@ public void hasErpRedeemScriptStructure_erp_fed_redeem_script_three_bytes_csv_va
 
     @Test
     public void hasErpRedeemScriptStructure_erp_fed_redeem_script_three_bytes_including_sign_csv_value() {
-        Script redeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             33_000L // Any value above 32_767 needs an extra byte to indicate the sign
@@ -135,7 +135,7 @@ public void hasErpRedeemScriptStructure_erp_fed_redeem_script_three_bytes_includ
 
     @Test
     public void hasErpRedeemScriptStructure_erp_fed_redeem_script_four_bytes_csv_value() {
-        Script redeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             10_000_000L
@@ -146,7 +146,7 @@ public void hasErpRedeemScriptStructure_erp_fed_redeem_script_four_bytes_csv_val
 
     @Test
     public void hasErpRedeemScriptStructure_erp_fed_redeem_script_four_bytes_including_sign_csv_value() {
-        Script redeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             8_400_000L // Any value above 8_388_607 needs an extra byte to indicate the sign
@@ -157,7 +157,7 @@ public void hasErpRedeemScriptStructure_erp_fed_redeem_script_four_bytes_includi
 
     @Test
     public void hasErpRedeemScriptStructure_fast_bridge_erp_redeem_script_removing_prefix() {
-        Script redeemScript = RedeemScriptUtils.createFastBridgeErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createFastBridgeErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             500L,
@@ -175,7 +175,7 @@ public void hasErpRedeemScriptStructure_fast_bridge_erp_redeem_script_removing_p
 
     @Test
     public void hasFastBridgePrefix_fast_bridge_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             Sha256Hash.of(new byte[]{1}).getBytes(),
             defaultRedeemScriptKeys
         );
@@ -185,7 +185,7 @@ public void hasFastBridgePrefix_fast_bridge_redeem_script() {
 
     @Test
     public void hasFastBridgePrefix_erp_fast_bridge_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createFastBridgeErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createFastBridgeErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             500L,
@@ -197,13 +197,13 @@ public void hasFastBridgePrefix_erp_fast_bridge_redeem_script() {
 
     @Test
     public void hasFastBridgePrefix_standard_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(defaultRedeemScriptKeys);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(defaultRedeemScriptKeys);
         Assert.assertFalse(RedeemScriptValidator.hasFastBridgePrefix(redeemScript.getChunks()));
     }
 
     @Test(expected = VerificationException.class)
     public void removeOpCheckMultiSig_non_standard_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             defaultRedeemScriptKeys,
             emergencyRedeemScriptKeys,
             500L
@@ -214,7 +214,7 @@ public void removeOpCheckMultiSig_non_standard_redeem_script() {
 
     @Test
     public void removeOpCheckMultiSig_standard_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(defaultRedeemScriptKeys);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(defaultRedeemScriptKeys);
         List<ScriptChunk> chunks = RedeemScriptValidator.removeOpCheckMultisig(redeemScript);
 
         Assert.assertEquals(defaultRedeemScriptKeys.size() + 2, chunks.size()); // 1 chunk per key + OP_M + OP_N
diff --git a/src/test/java/co/rsk/bitcoinj/script/ScriptTest.java b/src/test/java/co/rsk/bitcoinj/script/ScriptTest.java
index b5bf8f29e..7bec006b1 100644
--- a/src/test/java/co/rsk/bitcoinj/script/ScriptTest.java
+++ b/src/test/java/co/rsk/bitcoinj/script/ScriptTest.java
@@ -471,7 +471,7 @@ public void numberBuilderNegative() {
     @Test
     public void getNumberOfSignaturesRequiredToSpend_fast_bridge_redeem_script() {
         byte[] data = Sha256Hash.of(new byte[]{1}).getBytes();
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             data, btcECKeyList);
 
         Assert.assertEquals(2, fastBridgeRedeemScript.getNumberOfSignaturesRequiredToSpend());
@@ -479,7 +479,7 @@ public void getNumberOfSignaturesRequiredToSpend_fast_bridge_redeem_script() {
 
     @Test
     public void getNumberOfSignaturesRequiredToSpend_erp_redeem_script() {
-        Script erpRedeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script erpRedeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             btcECKeyList,
             erpFedECKeyList,
             500L
@@ -490,7 +490,7 @@ public void getNumberOfSignaturesRequiredToSpend_erp_redeem_script() {
 
     @Test
     public void getNumberOfSignaturesRequiredToSpend_fast_bridge_erp_redeem_script() {
-        Script fastBridgeErpRedeemScript = RedeemScriptUtils.createFastBridgeErpRedeemScript(
+        Script fastBridgeErpRedeemScript = RedeemScriptTestUtils.createFastBridgeErpRedeemScript(
             btcECKeyList,
             erpFedECKeyList,
             500L,
@@ -502,14 +502,14 @@ public void getNumberOfSignaturesRequiredToSpend_fast_bridge_erp_redeem_script()
 
     @Test
     public void getNumberOfSignaturesRequiredToSpend_no_fast_bridge_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(btcECKeyList);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(btcECKeyList);
         Assert.assertEquals(2, redeemScript.getNumberOfSignaturesRequiredToSpend());
     }
 
     @Test
     public void getSigInsertionIndex_fast_bridge_redeem_script() {
         byte[] data = Sha256Hash.of(new byte[]{1}).getBytes();
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             data, btcECKeyList);
 
         testGetSigInsertionIndex(fastBridgeRedeemScript);
@@ -517,7 +517,7 @@ public void getSigInsertionIndex_fast_bridge_redeem_script() {
 
     @Test
     public void getSigInsertionIndex_erp_redeem_script() {
-        Script erpRedeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script erpRedeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             btcECKeyList,
             erpFedECKeyList,
             500L
@@ -528,7 +528,7 @@ public void getSigInsertionIndex_erp_redeem_script() {
 
     @Test
     public void getSigInsertionIndex_fast_bridge_erp_redeem_script() {
-        Script fastBridgeErpRedeemScript = RedeemScriptUtils.createFastBridgeErpRedeemScript(
+        Script fastBridgeErpRedeemScript = RedeemScriptTestUtils.createFastBridgeErpRedeemScript(
             btcECKeyList,
             erpFedECKeyList,
             500L,
@@ -540,14 +540,14 @@ public void getSigInsertionIndex_fast_bridge_erp_redeem_script() {
 
     @Test
     public void getSigInsertionIndex_no_fast_bridge_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(btcECKeyList);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(btcECKeyList);
         testGetSigInsertionIndex(redeemScript);
     }
 
     @Test
     public void isSentToMultiSig_fast_bridge_multiSig() {
         byte[] data = Sha256Hash.of(new byte[]{1}).getBytes();
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             data,
             btcECKeyList
         );
@@ -557,7 +557,7 @@ public void isSentToMultiSig_fast_bridge_multiSig() {
 
     @Test
     public void isSentToMultiSig_erp_multiSig() {
-        Script erpRedeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script erpRedeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             btcECKeyList,
             erpFedECKeyList,
             500L
@@ -568,7 +568,7 @@ public void isSentToMultiSig_erp_multiSig() {
 
     @Test
     public void isSentToMultiSig_fast_bridge_erp_multiSig() {
-        Script fastBridgeErpRedeemScript = RedeemScriptUtils.createFastBridgeErpRedeemScript(
+        Script fastBridgeErpRedeemScript = RedeemScriptTestUtils.createFastBridgeErpRedeemScript(
             btcECKeyList,
             erpFedECKeyList,
             500L,
@@ -580,13 +580,13 @@ public void isSentToMultiSig_fast_bridge_erp_multiSig() {
 
     @Test
     public void isStandardMultiSig_standard_multiSig() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(btcECKeyList);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(btcECKeyList);
         Assert.assertTrue(redeemScript.isSentToMultiSig());
     }
 
     @Test
     public void createEmptyInputScript_standard_redeemScript() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(btcECKeyList);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(btcECKeyList);
         Script spk = ScriptBuilder.createP2SHOutputScript(redeemScript);
         Script inputScript = spk.createEmptyInputScript(null, redeemScript);
 
@@ -600,7 +600,7 @@ public void createEmptyInputScript_standard_redeemScript() {
 
     @Test
     public void createEmptyInputScript_fast_bridge_redeemScript() {
-        Script redeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             Sha256Hash.of(new byte[]{1}).getBytes(),
             btcECKeyList
         );
@@ -618,7 +618,7 @@ public void createEmptyInputScript_fast_bridge_redeemScript() {
 
     @Test
     public void createEmptyInputScript_erp_redeemScript() {
-        Script redeemScript = RedeemScriptUtils.createErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createErpRedeemScript(
             btcECKeyList,
             erpFedECKeyList,
             500L
@@ -643,7 +643,7 @@ public void createEmptyInputScript_erp_redeemScript() {
 
     @Test
     public void createEmptyInputScript_fast_bridge_erp_redeemScript() {
-        Script redeemScript = RedeemScriptUtils.createFastBridgeErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createFastBridgeErpRedeemScript(
             btcECKeyList,
             erpFedECKeyList,
             500L,
@@ -669,7 +669,7 @@ public void createEmptyInputScript_fast_bridge_erp_redeemScript() {
 
     @Test
     public void createEmptyInputScript_p2sh_erp_redeemScript() {
-        Script redeemScript = RedeemScriptUtils.createP2shErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createP2shErpRedeemScript(
             btcECKeyList,
             erpFedECKeyList,
             500L
@@ -694,7 +694,7 @@ public void createEmptyInputScript_p2sh_erp_redeemScript() {
 
     @Test
     public void createEmptyInputScript_fast_bridge_p2sh_erp_redeemScript() {
-        Script redeemScript = RedeemScriptUtils.createFastBridgeP2shErpRedeemScript(
+        Script redeemScript = RedeemScriptTestUtils.createFastBridgeP2shErpRedeemScript(
             btcECKeyList,
             erpFedECKeyList,
             500L,
diff --git a/src/test/java/co/rsk/bitcoinj/script/StandardRedeemScriptParserTest.java b/src/test/java/co/rsk/bitcoinj/script/StandardRedeemScriptParserTest.java
index c8c2ae8c4..34e5c54b2 100644
--- a/src/test/java/co/rsk/bitcoinj/script/StandardRedeemScriptParserTest.java
+++ b/src/test/java/co/rsk/bitcoinj/script/StandardRedeemScriptParserTest.java
@@ -34,7 +34,7 @@ public void setUp() {
     @Test
     public void getSigInsertionIndex_fast_bridge_redeem_script() {
         byte[] data = Sha256Hash.of(new byte[]{1}).getBytes();
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             data,
             btcECKeyList
         );
@@ -69,7 +69,7 @@ public void getSigInsertionIndex_fast_bridge_redeem_script() {
 
         byte[] txSigEncoded = txSig.encodeToBitcoin();
 
-        int sigIndex = parser.getSigInsertionIndex(sigHash, ecKey1);
+        int sigIndex = inputScript.getSigInsertionIndex(sigHash, ecKey1);
         Assert.assertEquals(0, sigIndex);
 
         inputScript = ScriptBuilder.updateScriptWithSignature(
@@ -82,13 +82,13 @@ public void getSigInsertionIndex_fast_bridge_redeem_script() {
 
         parser = RedeemScriptParserFactory.get(inputScript.getChunks());
 
-        sigIndex = parser.getSigInsertionIndex(sigHash, ecKey2);
+        sigIndex = inputScript.getSigInsertionIndex(sigHash, ecKey2);
         Assert.assertEquals(1, sigIndex);
     }
 
     @Test
     public void getSigInsertionIndex_no_fast_bridge_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(btcECKeyList);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(btcECKeyList);
 
         BtcTransaction fundTx = new BtcTransaction(networkParameters);
         fundTx.addOutput(Coin.FIFTY_COINS, ecKey1.toAddress(networkParameters));
@@ -123,7 +123,7 @@ public void getSigInsertionIndex_no_fast_bridge_redeem_script() {
         );
         byte[] txSigEncoded = txSig.encodeToBitcoin();
 
-        int sigIndex = parser.getSigInsertionIndex(sigHash, ecKey1);
+        int sigIndex = inputScript.getSigInsertionIndex(sigHash, ecKey1);
         Assert.assertEquals(0, sigIndex);
 
         inputScript = ScriptBuilder.updateScriptWithSignature(
@@ -136,14 +136,14 @@ public void getSigInsertionIndex_no_fast_bridge_redeem_script() {
 
         parser = RedeemScriptParserFactory.get(inputScript.getChunks());
 
-        sigIndex = parser.getSigInsertionIndex(sigHash, ecKey2);
+        sigIndex = inputScript.getSigInsertionIndex(sigHash, ecKey2);
         Assert.assertEquals(1, sigIndex);
     }
 
     @Test
     public void findKeyInRedeem_fast_bridge_redeem_script() {
         byte[] data = Sha256Hash.of(new byte[]{1}).getBytes();
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             data,
             btcECKeyList
         );
@@ -158,7 +158,7 @@ public void findKeyInRedeem_fast_bridge_redeem_script() {
     @Test(expected = IllegalStateException.class)
     public void findKeyInRedeem_fast_bridge_redeem_script_no_matching_key() {
         byte[] data = Sha256Hash.of(new byte[]{1}).getBytes();
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             data,
             btcECKeyList
         );
@@ -171,7 +171,7 @@ public void findKeyInRedeem_fast_bridge_redeem_script_no_matching_key() {
 
     @Test(expected = IllegalStateException.class)
     public void findKeyInRedeem_standard_redeem_script_no_matching_key() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(btcECKeyList);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(btcECKeyList);
         BtcECKey unmatchingBtcECKey = BtcECKey.fromPrivate(BigInteger.valueOf(400));
 
         RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScript.getChunks());
@@ -182,7 +182,7 @@ public void findKeyInRedeem_standard_redeem_script_no_matching_key() {
     @Test
     public void getPubKeys_fast_bridge_redeem_script() {
         byte[] data = Sha256Hash.of(new byte[]{1}).getBytes();
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             data,
             btcECKeyList
         );
@@ -208,7 +208,7 @@ public void getPubKeys_fast_bridge_redeem_script() {
 
     @Test
     public void getPubKeys_standard_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(btcECKeyList);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(btcECKeyList);
 
         RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScript.getChunks());
         List<BtcECKey> obtainedList = parser.getPubKeys();
@@ -248,7 +248,7 @@ public void getM_from_no_multiSig() {
     @Test
     public void getM_from_multiSig_fast_bridge_redeem_script() {
         byte[] data = Sha256Hash.of(new byte[]{1}).getBytes();
-        Script fastBridgeRedeemScript = RedeemScriptUtils.createFastBridgeRedeemScript(
+        Script fastBridgeRedeemScript = RedeemScriptTestUtils.createFastBridgeRedeemScript(
             data,
             btcECKeyList
         );
@@ -260,7 +260,7 @@ public void getM_from_multiSig_fast_bridge_redeem_script() {
 
     @Test
     public void getM_from_multiSig_standard_redeem_script() {
-        Script redeemScript = RedeemScriptUtils.createStandardRedeemScript(btcECKeyList);
+        Script redeemScript = RedeemScriptTestUtils.createStandardRedeemScript(btcECKeyList);
         RedeemScriptParser parser = RedeemScriptParserFactory.get(redeemScript.getChunks());
 
         Assert.assertEquals(2, parser.getM());