diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal
index 590fd32796..0853a05f2f 100644
--- a/cardano-api/cardano-api.cabal
+++ b/cardano-api/cardano-api.cabal
@@ -385,7 +385,6 @@ test-suite cardano-api-test
     hedgehog-quickcheck,
     microlens,
     mtl,
-    ordered-containers,
     ouroboros-consensus,
     ouroboros-consensus-protocol,
     raw-strings-qq,
diff --git a/cardano-api/src/Cardano/Api/Experimental/Tx.hs b/cardano-api/src/Cardano/Api/Experimental/Tx.hs
index 1641e86a48..86663d2761 100644
--- a/cardano-api/src/Cardano/Api/Experimental/Tx.hs
+++ b/cardano-api/src/Cardano/Api/Experimental/Tx.hs
@@ -205,6 +205,12 @@ module Cardano.Api.Experimental.Tx
     -- ** Internal functions
   , extractExecutionUnits
   , getTxScriptWitnessRequirements
+  , extractWitnessableTxIns
+  , extractWitnessableMints
+  , extractWitnessableCertificates
+  , extractWitnessableWithdrawals
+  , extractWitnessableVotes
+  , extractWitnessableProposals
   )
 where
 
diff --git a/cardano-api/src/Cardano/Api/Experimental/Tx/Internal/BodyContent/New.hs b/cardano-api/src/Cardano/Api/Experimental/Tx/Internal/BodyContent/New.hs
index 6f3c0072cf..4f3af6a432 100644
--- a/cardano-api/src/Cardano/Api/Experimental/Tx/Internal/BodyContent/New.hs
+++ b/cardano-api/src/Cardano/Api/Experimental/Tx/Internal/BodyContent/New.hs
@@ -60,6 +60,12 @@ module Cardano.Api.Experimental.Tx.Internal.BodyContent.New
 
     -- * Internal conversions
   , convProposalProcedures
+  , extractWitnessableTxIns
+  , extractWitnessableMints
+  , extractWitnessableCertificates
+  , extractWitnessableWithdrawals
+  , extractWitnessableVotes
+  , extractWitnessableProposals
 
     -- * Legacy conversions
   , DatumDecodingError (..)
diff --git a/cardano-api/test/cardano-api-test/Test/Cardano/Api/Transaction/Body/Plutus/Scripts.hs b/cardano-api/test/cardano-api-test/Test/Cardano/Api/Transaction/Body/Plutus/Scripts.hs
index 8a14fc0ce5..81e253090d 100644
--- a/cardano-api/test/cardano-api-test/Test/Cardano/Api/Transaction/Body/Plutus/Scripts.hs
+++ b/cardano-api/test/cardano-api-test/Test/Cardano/Api/Transaction/Body/Plutus/Scripts.hs
@@ -11,7 +11,6 @@ where
 import Cardano.Api (AlonzoEraOnwards (..))
 import Cardano.Api qualified as Api
 import Cardano.Api.Experimental
-import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Experimental.AnyScript
 import Cardano.Api.Experimental.AnyScriptWitness
 import Cardano.Api.Experimental.Plutus hiding (AnyPlutusScript (..))
@@ -25,7 +24,6 @@ import Prelude
 
 import Data.Function
 import Data.List qualified as List
-import Data.Map.Ordered qualified as OMap
 import Data.Map.Strict qualified as Map
 
 import Test.Gen.Cardano.Api.Experimental qualified as Exp
@@ -178,30 +176,15 @@ prop_extractAllIndexedPlutusScriptWitnesses =
 
     let allGeneratedPlutusScriptWitnesses =
           mconcat
-            [ createIndexedPlutusScriptWitnesses $ [(Exp.WitTxIn tIn, sWit) | (tIn, sWit) <- generatedTxInWits]
+            [ createIndexedPlutusScriptWitnesses $ Exp.extractWitnessableTxIns generatedTxInWits
             , createIndexedPlutusScriptWitnesses $
-                [ (Exp.WitMint pid pAssets, anyScriptWitnessToAnyWitness sWit)
-                | (pid, (pAssets, sWit)) <- Map.toList $ Exp.unTxMintValue generatedTxMintWits
-                ]
-            , createIndexedPlutusScriptWitnesses
-                [ (Exp.WitTxCert c scred, wit)
-                | (Certificate c, Just (scred, wit)) <-
-                    OMap.toAscList $ Exp.unTxCertificates generatedTxCertWits
-                ]
-            , createIndexedPlutusScriptWitnesses
-                [ (Exp.WitWithdrawal sAddr deposit, wit)
-                | (sAddr, deposit, wit) <- Exp.unTxWithdrawals generatedTxWithdrawals
-                ]
-            , createIndexedPlutusScriptWitnesses
-                [ (Exp.WitVote v, wit)
-                | let Exp.TxVotingProcedures _ vMap = generatedTxVotingprocedures
-                , (v, wit) <- Map.toList vMap
-                ]
-            , createIndexedPlutusScriptWitnesses
-                [ (Exp.WitProposal p, wit)
-                | let Exp.TxProposalProcedures pMap = generatedTxProposalProcedures
-                , (p, wit) <- OMap.toAscList pMap
-                ]
+                map (\(w, sw) -> (w, anyScriptWitnessToAnyWitness sw)) $
+                  Exp.extractWitnessableMints generatedTxMintWits
+            , createIndexedPlutusScriptWitnesses $ Exp.extractWitnessableCertificates generatedTxCertWits
+            , createIndexedPlutusScriptWitnesses $ Exp.extractWitnessableWithdrawals generatedTxWithdrawals
+            , createIndexedPlutusScriptWitnesses $ Exp.extractWitnessableVotes (Just generatedTxVotingprocedures)
+            , createIndexedPlutusScriptWitnesses $
+                Exp.extractWitnessableProposals (Just generatedTxProposalProcedures)
             ]
 
     H.note_ "All generated script witnesses"