diff --git a/plutarch-design-pattern.cabal b/plutarch-design-pattern.cabal
index fad869e..f533357 100644
--- a/plutarch-design-pattern.cabal
+++ b/plutarch-design-pattern.cabal
@@ -100,7 +100,6 @@ common test-dependencies
     , hedgehog
     , hedgehog-quickcheck
     , liqwid-plutarch-extra
-    , optics
     , plutarch
     , plutarch-context-builder
     , plutarch-extra
diff --git a/test/Spec/MerkelizedValidatorSpec.hs b/test/Spec/MerkelizedValidatorSpec.hs
index 956ba94..06ba439 100644
--- a/test/Spec/MerkelizedValidatorSpec.hs
+++ b/test/Spec/MerkelizedValidatorSpec.hs
@@ -33,7 +33,6 @@ import PlutusLedgerApi.V2 (
   BuiltinByteString,
   Credential (..),
   ScriptContext,
-  ScriptHash (..),
   ScriptPurpose (..),
   StakingCredential (..),
  )
@@ -171,7 +170,7 @@ prop_withdrawValidator = forAll withdrawInput check
                   #$ pdcons @"outputState"
                   # pdata outputState
                   # pdnil
-          cred = StakingHash (ScriptCredential (ScriptHash bs))
+          cred = mkStakingHashFromByteString bs
           context :: ClosedTerm PScriptContext
           context = pconstant (withdrawCtxWithCred cred)
        in fromPPartial $ withdraw # pforgetData (pdata redeemer) # context
@@ -185,7 +184,7 @@ prop_spendValidator = forAll spendInput check
       bs <- genByteString 56
       return (x, y, bs)
     check (x :: Integer, y :: Integer, bs :: BuiltinByteString) =
-      let cred = StakingHash (ScriptCredential (ScriptHash bs))
+      let cred = mkStakingHashFromByteString bs
           redeemer =
             MerkelizedValidator.WithdrawRedeemer
               { inputState = [PlutusTx.toBuiltinData x, PlutusTx.toBuiltinData y]
diff --git a/test/Spec/MultiUTxOIndexerSpec.hs b/test/Spec/MultiUTxOIndexerSpec.hs
index 2779e27..4d3cb92 100644
--- a/test/Spec/MultiUTxOIndexerSpec.hs
+++ b/test/Spec/MultiUTxOIndexerSpec.hs
@@ -163,7 +163,7 @@ unitTest = tryFromPTerm "Multi UTxI Indexer Unit Test" validator $ do
 mkInputUTxO :: BuiltinByteString -> BuiltinByteString -> UTXO
 mkInputUTxO txId valHash =
   mconcat
-    [ address (Address (ScriptCredential (ScriptHash valHash)) Nothing)
+    [ address (mkAddressFromByteString valHash)
     , withRefTxId (TxId txId)
     , withRefIndex 0
     ]