diff --git a/aries_cloudagent/didcomm_v2/__init__.py b/aries_cloudagent/didcomm_v2/__init__.py
index f5ef9a56d4..e69de29bb2 100644
--- a/aries_cloudagent/didcomm_v2/__init__.py
+++ b/aries_cloudagent/didcomm_v2/__init__.py
@@ -1,4 +0,0 @@
-from .adapters import ResolverAdapter, SecretsAdapter
-
-
-__all__ = ["ResolverAdapter", "SecretsAdapter"]
diff --git a/aries_cloudagent/didcomm_v2/adapters.py b/aries_cloudagent/didcomm_v2/adapters.py
index 485643c962..349c5479ce 100644
--- a/aries_cloudagent/didcomm_v2/adapters.py
+++ b/aries_cloudagent/didcomm_v2/adapters.py
@@ -8,7 +8,7 @@
     from didcomm_messaging import SecretsManager
     from didcomm_messaging.crypto.backend.askar import AskarSecretKey
     from didcomm_messaging.resolver import DIDResolver as DMPResolver
-except ImportError as err:
+except ModuleNotFoundError as err:
     raise ImportError("Install the didcommv2 extra to use this module.") from err
 
 from ..core.error import BaseError
diff --git a/aries_cloudagent/messaging/v2_agent_message.py b/aries_cloudagent/messaging/v2_agent_message.py
index ddd177298b..3706bdfcfc 100644
--- a/aries_cloudagent/messaging/v2_agent_message.py
+++ b/aries_cloudagent/messaging/v2_agent_message.py
@@ -3,17 +3,17 @@
 from uuid import uuid4
 
 from .base_message import BaseMessage, DIDCommVersion
-from .models.base import BaseModel
 
 
 class V2AgentMessage(BaseMessage):
     """DIDComm V2 message base class."""
 
     def __init__(self, message, *args, **kwargs):
+        """Initialize a v2 agent message instance."""
         super().__init__(*args, **kwargs)
         self.message = message
         self.msg_format = DIDCommVersion.v2
-        if not "id" in self.message:
+        if "id" not in self.message:
             self.message["id"] = str(uuid4())
 
     @property
@@ -33,12 +33,15 @@ def _thread_id(self):
         return self.message.get("thid", self.message.get("id"))
 
     def serialize(self, msg_format: DIDCommVersion = DIDCommVersion.v1) -> dict:
+        """Serialize a message."""
         return self.message
 
-    def deserialize(cls, value: dict, msg_format: DIDCommVersion = DIDCommVersion.v2):
+    def deserialize(self, value: dict, msg_format: DIDCommVersion = DIDCommVersion.v2):
+        """Deserialize a message."""
         self.message = value
         self.msg_format = msg_format
 
     @property
     def Handler(self):
+        """Message handler."""
         return None
diff --git a/aries_cloudagent/transport/tests/test_pack_format.py b/aries_cloudagent/transport/tests/test_pack_format.py
index e1f66fbb15..acf519c9d3 100644
--- a/aries_cloudagent/transport/tests/test_pack_format.py
+++ b/aries_cloudagent/transport/tests/test_pack_format.py
@@ -13,7 +13,7 @@
 from ...wallet.key_type import ED25519
 from .. import pack_format as test_module
 from ..error import RecipientKeysError, WireFormatEncodeError, WireFormatParseError
-from ..pack_format import PackWireFormat
+from ..pack_format import V1PackWireFormat
 
 
 class TestPackWireFormat(IsolatedAsyncioTestCase):
@@ -37,7 +37,7 @@ def setUp(self):
         self.wallet = self.session.inject(BaseWallet)
 
     async def test_errors(self):
-        serializer = PackWireFormat()
+        serializer = V1PackWireFormat()
         bad_values = [None, "", "1", "[]", "{..."]
 
         for message_json in bad_values:
@@ -62,7 +62,7 @@ async def test_errors(self):
                 await serializer.parse_message(self.session, json.dumps(x_message))
         assert "Message JSON parsing failed" in str(context.exception)
 
-        serializer = PackWireFormat()
+        serializer = V1PackWireFormat()
         serializer.task_queue = None
         with mock.patch.object(
             serializer, "unpack", mock.CoroutineMock()
@@ -78,7 +78,7 @@ async def test_errors(self):
             )
 
     async def test_pack_x(self):
-        serializer = PackWireFormat()
+        serializer = V1PackWireFormat()
 
         with self.assertRaises(WireFormatEncodeError):
             await serializer.pack(self.session, None, None, None, None)
@@ -113,7 +113,7 @@ async def test_pack_x(self):
                 await serializer.pack(session, None, ["key"], ["key"], ["key"])
 
     async def test_unpacked(self):
-        serializer = PackWireFormat()
+        serializer = V1PackWireFormat()
         message_json = json.dumps(self.test_message)
         message_dict, delivery = await serializer.parse_message(
             self.session, message_json
@@ -124,7 +124,7 @@ async def test_unpacked(self):
         assert delivery.direct_response_mode == "all"
 
     async def test_fallback(self):
-        serializer = PackWireFormat()
+        serializer = V1PackWireFormat()
 
         message = self.test_message.copy()
         message.pop("@type")
@@ -140,7 +140,7 @@ async def test_encode_decode(self):
         local_did = await self.wallet.create_local_did(
             method=SOV, key_type=ED25519, seed=self.test_seed
         )
-        serializer = PackWireFormat()
+        serializer = V1PackWireFormat()
         recipient_keys = (local_did.verkey,)
         routing_keys = ()
         sender_key = local_did.verkey
@@ -177,7 +177,7 @@ async def test_forward(self):
         router_did = await self.wallet.create_local_did(
             method=SOV, key_type=ED25519, seed=self.test_routing_seed
         )
-        serializer = PackWireFormat()
+        serializer = V1PackWireFormat()
         recipient_keys = (local_did.verkey,)
         routing_keys = (router_did.verkey,)
         sender_key = local_did.verkey
@@ -207,7 +207,7 @@ async def test_get_recipient_keys(self):
             ).decode()
         }
 
-        serializer = PackWireFormat()
+        serializer = V1PackWireFormat()
         actual_recip_keys = serializer.get_recipient_keys(json.dumps(enc_message))
 
         self.assertEqual(recip_keys, actual_recip_keys)
@@ -215,7 +215,7 @@ async def test_get_recipient_keys(self):
     async def test_get_recipient_keys_fails(self):
         enc_message = {"protected": {}}
 
-        serializer = PackWireFormat()
+        serializer = V1PackWireFormat()
 
         with self.assertRaises(RecipientKeysError):
             serializer.get_recipient_keys(json.dumps(enc_message))