diff --git a/.env.DApp b/.env.DApp
new file mode 100644
index 000000000..444ef413b
--- /dev/null
+++ b/.env.DApp
@@ -0,0 +1,4 @@
+SCHEME = "DApp" 
+APP_IDENTIFIER = "com.walletconnect.dapp" 
+MATCH_IDENTIFIERS = "com.walletconnect.dapp"
+APPLE_ID = "1606875879"
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 06c696525..02513dfa8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,6 +2,14 @@ name: release
 
 on:
   workflow_dispatch:
+    inputs:
+      app:
+        type: choice
+        description: Which sample app to release
+        options: 
+        - DApp
+        - WalletApp
+        - Showcase
 
 jobs:
   build:
@@ -32,4 +40,4 @@ jobs:
         APPLE_KEY_CONTENT: ${{ secrets.APPLE_KEY_CONTENT }}
         WALLETAPP_SENTRY_DSN: ${{ secrets.WALLETAPP_SENTRY_DSN }}
       run: |
-        make release_wallet APPLE_ID=${{ secrets.APPLE_ID }} TOKEN=$(echo -n $GH_USER:$GH_TOKEN | base64) PROJECT_ID=${{ secrets.RELEASE_PROJECT_ID }} WALLETAPP_SENTRY_DSN=${{ secrets.WALLETAPP_SENTRY_DSN }} MIXPANEL_TOKEN=${{secrets.MIXPANEL_TOKEN}}
+        make release APPLE_ID=${{ secrets.APPLE_ID }} TOKEN=$(echo -n $GH_USER:$GH_TOKEN | base64) PROJECT_ID=${{ secrets.RELEASE_PROJECT_ID }} WALLETAPP_SENTRY_DSN=${{ secrets.WALLETAPP_SENTRY_DSN }} MIXPANEL_TOKEN=${{secrets.MIXPANEL_TOKEN}} APP=${{ github.event.inputs.app }}
diff --git a/Example/IntegrationTests/Push/NotifyTests.swift b/Example/IntegrationTests/Push/NotifyTests.swift
index 1618881e6..6bbbe9289 100644
--- a/Example/IntegrationTests/Push/NotifyTests.swift
+++ b/Example/IntegrationTests/Push/NotifyTests.swift
@@ -245,29 +245,29 @@ final class NotifyTests: XCTestCase {
         }
     }
 
-    func testFetchHistory() async throws {
-        let subscribeExpectation = expectation(description: "fetch notify subscription")
-        let account = Account("eip155:1:0x622b17376F76d72C43527a917f59273247A917b4")!
-
-        var subscription: NotifySubscription!
-        walletNotifyClientA.subscriptionsPublisher
-            .sink { subscriptions in
-                subscription = subscriptions.first
-                subscribeExpectation.fulfill()
-            }.store(in: &publishers)
-
-        try await walletNotifyClientA.register(account: account, domain: gmDappDomain) { message in
-            let privateKey = Data(hex: "c3ff8a0ae33ac5d58e515055c5870fa2f220d070997bd6fd77a5f2c148528ff0")
-            let signer = MessageSignerFactory(signerFactory: DefaultSignerFactory()).create(projectId: InputConfig.projectId)
-            return try! signer.sign(message: message, privateKey: privateKey, type: .eip191)
-        }
-
-        await fulfillment(of: [subscribeExpectation], timeout: InputConfig.defaultTimeout)
-
-        let hasMore = try await walletNotifyClientA.fetchHistory(subscription: subscription, after: nil, limit: 20)
-        XCTAssertTrue(hasMore)
-        XCTAssertTrue(walletNotifyClientA.getMessageHistory(topic: subscription.topic).count == 20)
-    }
+//    func testFetchHistory() async throws {
+//        let subscribeExpectation = expectation(description: "fetch notify subscription")
+//        let account = Account("eip155:1:0x622b17376F76d72C43527a917f59273247A917b4")!
+//
+//        var subscription: NotifySubscription!
+//        walletNotifyClientA.subscriptionsPublisher
+//            .sink { subscriptions in
+//                subscription = subscriptions.first
+//                subscribeExpectation.fulfill()
+//            }.store(in: &publishers)
+//
+//        try await walletNotifyClientA.register(account: account, domain: gmDappDomain) { message in
+//            let privateKey = Data(hex: "c3ff8a0ae33ac5d58e515055c5870fa2f220d070997bd6fd77a5f2c148528ff0")
+//            let signer = MessageSignerFactory(signerFactory: DefaultSignerFactory()).create(projectId: InputConfig.projectId)
+//            return try! signer.sign(message: message, privateKey: privateKey, type: .eip191)
+//        }
+//
+//        await fulfillment(of: [subscribeExpectation], timeout: InputConfig.defaultTimeout)
+//
+//        let hasMore = try await walletNotifyClientA.fetchHistory(subscription: subscription, after: nil, limit: 20)
+//        XCTAssertTrue(hasMore)
+//        XCTAssertTrue(walletNotifyClientA.getMessageHistory(topic: subscription.topic).count == 20)
+//    }
 }
 
 
diff --git a/Example/IntegrationTests/Sign/SignClientTests.swift b/Example/IntegrationTests/Sign/SignClientTests.swift
index b1cfb2978..6372b1fe8 100644
--- a/Example/IntegrationTests/Sign/SignClientTests.swift
+++ b/Example/IntegrationTests/Sign/SignClientTests.swift
@@ -110,7 +110,7 @@ final class SignClientTests: XCTestCase {
         wallet.sessionProposalPublisher.sink { [unowned self] (proposal, _) in
             Task(priority: .high) {
                 do {
-                    try await wallet.reject(proposalId: proposal.id, reason: .userRejectedChains) // TODO: Review reason
+                    try await wallet.reject(proposalId: proposal.id, reason: .unsupportedChains)
                     store.rejectedProposal = proposal
                     semaphore.signal()
                 } catch { XCTFail("\(error)") }
@@ -119,7 +119,7 @@ final class SignClientTests: XCTestCase {
         dapp.sessionRejectionPublisher.sink { proposal, _ in
             semaphore.wait()
             XCTAssertEqual(store.rejectedProposal, proposal)
-            sessionRejectExpectation.fulfill() // TODO: Assert reason code
+            sessionRejectExpectation.fulfill()
         }.store(in: &publishers)
         await fulfillment(of: [sessionRejectExpectation], timeout: InputConfig.defaultTimeout)
     }
diff --git a/Example/Shared/Signer/ETHSigner.swift b/Example/Shared/Signer/ETHSigner.swift
index 6ff523441..dfe84420b 100644
--- a/Example/Shared/Signer/ETHSigner.swift
+++ b/Example/Shared/Signer/ETHSigner.swift
@@ -32,12 +32,14 @@ struct ETHSigner {
         return AnyCodable(result)
     }
 
-    func sendTransaction(_ params: AnyCodable) -> AnyCodable {
-        let params = try! params.get([EthereumTransaction].self)
+    func sendTransaction(_ params: AnyCodable) throws -> AnyCodable {
+        let params = try params.get([EthereumTransaction].self)
         var transaction = params[0]
         transaction.gas = EthereumQuantity(quantity: BigUInt("1234"))
+        transaction.nonce = EthereumQuantity(quantity: BigUInt("0"))
+        transaction.gasPrice = EthereumQuantity(quantity: BigUInt(0))
         print(transaction.description)
-        let signedTx = try! transaction.sign(with: self.privateKey, chainId: 4)
+        let signedTx = try transaction.sign(with: self.privateKey, chainId: 4)
         let (r, s, v) = (signedTx.r, signedTx.s, signedTx.v)
         let result = r.hex() + s.hex().dropFirst(2) + String(v.quantity, radix: 16)
         return AnyCodable(result)
diff --git a/Example/Shared/Signer/SOLSigner.swift b/Example/Shared/Signer/SOLSigner.swift
index f9f328069..32d97fcfd 100644
--- a/Example/Shared/Signer/SOLSigner.swift
+++ b/Example/Shared/Signer/SOLSigner.swift
@@ -9,7 +9,7 @@ struct SOLSigner {
         return account.publicKey.base58EncodedString
     }
 
-    private static let account: Account = {
+    static let account: Account = {
         let key = "4eN1YZm598FtdigriE5int7Gf5dxs58rzVh3ftRwxjkYXxkiDiweuvkop2Kr5Td174DcbVdDxzjWqQ96uir3NYka"
         return try! Account(secretKey: Data(Base58.decode(key)))
     }()
diff --git a/Example/Shared/Signer/Signer.swift b/Example/Shared/Signer/Signer.swift
index 16e75775f..3091c6c98 100644
--- a/Example/Shared/Signer/Signer.swift
+++ b/Example/Shared/Signer/Signer.swift
@@ -20,7 +20,7 @@ final class Signer {
             return signer.signTypedData(request.params)
 
         case "eth_sendTransaction":
-            return signer.sendTransaction(request.params)
+            return try signer.sendTransaction(request.params)
 
         case "solana_signTransaction":
             return SOLSigner.signTransaction(request.params)
diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift
index ece832c35..2c1b13756 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift
@@ -11,23 +11,35 @@ final class SessionProposalInteractor {
         
         let supportedRequiredChains = proposal.requiredNamespaces["eip155"]?.chains
         let supportedOptionalChains = proposal.optionalNamespaces?["eip155"]?.chains ?? []
-        let supportedChains = (supportedRequiredChains ?? []).union(supportedOptionalChains) ?? []
-        
+        var supportedChains = (supportedRequiredChains ?? []).union(supportedOptionalChains) 
+
         let supportedAccounts = Array(supportedChains).map { Account(blockchain: $0, address: account.address)! }
-        
+
         /* Use only supported values for production. I.e:
         let supportedMethods = ["eth_signTransaction", "personal_sign", "eth_signTypedData", "eth_sendTransaction", "eth_sign"]
         let supportedEvents = ["accountsChanged", "chainChanged"]
         let supportedChains = [Blockchain("eip155:1")!, Blockchain("eip155:137")!]
         let supportedAccounts = [Account(blockchain: Blockchain("eip155:1")!, address: ETHSigner.address)!, Account(blockchain: Blockchain("eip155:137")!, address: ETHSigner.address)!]
         */
-        let sessionNamespaces = try AutoNamespaces.build(
-            sessionProposal: proposal,
-            chains: Array(supportedChains),
-            methods: Array(supportedMethods),
-            events: Array(supportedEvents),
-            accounts: supportedAccounts
-        )
+        var sessionNamespaces: [String: SessionNamespace]!
+
+        do {
+            sessionNamespaces = try AutoNamespaces.build(
+                sessionProposal: proposal,
+                chains: Array(supportedChains),
+                methods: Array(supportedMethods),
+                events: Array(supportedEvents),
+                accounts: supportedAccounts
+            )
+        } catch let error as AutoNamespacesError {
+            try await reject(proposal: proposal, reason: RejectionReason(from: error))
+            AlertPresenter.present(message: error.localizedDescription, type: .error)
+            return false
+        } catch {
+            try await reject(proposal: proposal, reason: .userRejected)
+            AlertPresenter.present(message: error.localizedDescription, type: .error)
+            return false
+        }
         try await Web3Wallet.instance.approve(proposalId: proposal.id, namespaces: sessionNamespaces, sessionProperties: proposal.sessionProperties)
 
         if let uri = proposal.proposer.redirect?.native {
@@ -38,7 +50,7 @@ final class SessionProposalInteractor {
         }
     }
 
-    func reject(proposal: Session.Proposal) async throws {
+    func reject(proposal: Session.Proposal, reason: RejectionReason = .userRejected) async throws {
         try await Web3Wallet.instance.reject(proposalId: proposal.id, reason: .userRejected)
         
         /* Redirect */
diff --git a/Makefile b/Makefile
index 68c9b1a0b..7faf5e64b 100755
--- a/Makefile
+++ b/Makefile
@@ -67,12 +67,5 @@ smoke_tests:
 x_platform_protocol_tests:
 	./run_tests.sh --scheme IntegrationTests --testplan XPlatformProtocolTests --project Example/ExampleApp.xcodeproj
 
-release_wallet:
-	fastlane release_testflight username:$(APPLE_ID) token:$(TOKEN) relay_host:$(RELAY_HOST) project_id:$(PROJECT_ID) sentry_dsn:$(WALLETAPP_SENTRY_DSN) mixpanel_token:$(MIXPANEL_TOKEN) --env WalletApp
-
-release_showcase:
-	fastlane release_testflight username:$(APPLE_ID) token:$(TOKEN) relay_host:$(RELAY_HOST) project_id:$(PROJECT_ID) --env Showcase
-
-release_all:
-	fastlane release_testflight username:$(APPLE_ID) token:$(TOKEN) relay_host:$(RELAY_HOST) project_id:$(PROJECT_ID) sentry_dsn:$(WALLETAPP_SENTRY_DSN) mixpanel_token:$(MIXPANEL_TOKEN) --env WalletApp
-	fastlane release_testflight username:$(APPLE_ID) token:$(TOKEN) relay_host:$(RELAY_HOST) project_id:$(PROJECT_ID) --env Showcase
+release:
+	fastlane release_testflight username:$(APPLE_ID) token:$(TOKEN) relay_host:$(RELAY_HOST) project_id:$(PROJECT_ID) sentry_dsn:$(WALLETAPP_SENTRY_DSN) mixpanel_token:$(MIXPANEL_TOKEN) --env $(APP)
diff --git a/Sources/WalletConnectSign/Engine/Common/SessionEngine.swift b/Sources/WalletConnectSign/Engine/Common/SessionEngine.swift
index daf11e954..b874bf5fc 100644
--- a/Sources/WalletConnectSign/Engine/Common/SessionEngine.swift
+++ b/Sources/WalletConnectSign/Engine/Common/SessionEngine.swift
@@ -236,6 +236,7 @@ private extension SessionEngine {
     }
 
     func onSessionRequest(payload: RequestSubscriptionPayload<SessionType.RequestParams>) {
+        logger.debug("Received session request")
         let protocolMethod = SessionRequestProtocolMethod()
         let topic = payload.topic
         let request = Request(
diff --git a/Sources/WalletConnectSign/Namespace.swift b/Sources/WalletConnectSign/Namespace.swift
index 08ded8326..af84a5fb4 100644
--- a/Sources/WalletConnectSign/Namespace.swift
+++ b/Sources/WalletConnectSign/Namespace.swift
@@ -5,7 +5,7 @@ public enum AutoNamespacesError: Error, LocalizedError {
     case requiredAccountsNotSatisfied
     case requiredMethodsNotSatisfied
     case requiredEventsNotSatisfied
-    case emtySessionNamespacesForbidden
+    case emptySessionNamespacesForbidden
 
     public var errorDescription: String? {
         switch self {
@@ -17,7 +17,7 @@ public enum AutoNamespacesError: Error, LocalizedError {
             return "The required methods are not satisfied."
         case .requiredEventsNotSatisfied:
             return "The required events are not satisfied."
-        case .emtySessionNamespacesForbidden:
+        case .emptySessionNamespacesForbidden:
             return "Empty session namespaces are not allowed."
         }
     }
@@ -180,8 +180,9 @@ public enum AutoNamespaces {
             let proposalNamespace = $0.value
 
             if let proposalChains = proposalNamespace.chains {
-                let sessionChains = Set(proposalChains).intersection(Set(chains))
-                guard !sessionChains.isEmpty else {
+                let sessionChains = proposalChains
+
+                guard !sessionChains.isEmpty && proposalChains.isSubset(of: chains) else {
                     throw AutoNamespacesError.requiredChainsNotSatisfied
                 }
                 
@@ -340,7 +341,7 @@ public enum AutoNamespaces {
                 }
             }
         }
-        guard !sessionNamespaces.isEmpty else { throw AutoNamespacesError.emtySessionNamespacesForbidden }
+        guard !sessionNamespaces.isEmpty else { throw AutoNamespacesError.emptySessionNamespacesForbidden }
 
         return sessionNamespaces
     }
diff --git a/Sources/WalletConnectSign/RejectionReason.swift b/Sources/WalletConnectSign/RejectionReason.swift
index c2dff54c2..6044f6075 100644
--- a/Sources/WalletConnectSign/RejectionReason.swift
+++ b/Sources/WalletConnectSign/RejectionReason.swift
@@ -3,9 +3,10 @@ import Foundation
 /// https://github.com/ChainAgnostic/CAIPs/blob/master/CAIPs/caip-25.md
 public enum RejectionReason {
     case userRejected
-    case userRejectedChains
-    case userRejectedMethods
-    case userRejectedEvents
+    case unsupportedChains
+    case unsupportedMethods
+    case unsupportedAccounts
+    case upsupportedEvents
 }
 
 internal extension RejectionReason {
@@ -13,12 +14,31 @@ internal extension RejectionReason {
         switch self {
         case .userRejected:
             return SignReasonCode.userRejected
-        case .userRejectedChains:
-            return SignReasonCode.userRejectedChains
-        case .userRejectedMethods:
+        case .unsupportedChains:
+            return SignReasonCode.unsupportedChains
+        case .unsupportedMethods:
             return SignReasonCode.userRejectedMethods
-        case  .userRejectedEvents:
+        case  .upsupportedEvents:
             return SignReasonCode.userRejectedEvents
+        case .unsupportedAccounts:
+            return SignReasonCode.unsupportedAccounts
+        }
+    }
+}
+
+public extension RejectionReason {
+    init(from error: AutoNamespacesError) {
+        switch error {
+        case .requiredChainsNotSatisfied:
+            self = .unsupportedChains
+        case .requiredAccountsNotSatisfied:
+            self = .unsupportedAccounts
+        case .requiredMethodsNotSatisfied:
+            self = .unsupportedMethods
+        case .requiredEventsNotSatisfied:
+            self = .upsupportedEvents
+        case .emptySessionNamespacesForbidden:
+            self = .unsupportedAccounts
         }
     }
 }
diff --git a/Sources/WalletConnectSign/Sign/SessionRequestsProvider.swift b/Sources/WalletConnectSign/Sign/SessionRequestsProvider.swift
index 7838b65b7..89c8e9e79 100644
--- a/Sources/WalletConnectSign/Sign/SessionRequestsProvider.swift
+++ b/Sources/WalletConnectSign/Sign/SessionRequestsProvider.swift
@@ -4,6 +4,9 @@ import Foundation
 class SessionRequestsProvider {
     private let historyService: HistoryService
     private var sessionRequestPublisherSubject = PassthroughSubject<(request: Request, context: VerifyContext?), Never>()
+    private var lastEmitTime: Date?
+    private let debounceInterval: TimeInterval = 1
+
     public var sessionRequestPublisher: AnyPublisher<(request: Request, context: VerifyContext?), Never> {
         sessionRequestPublisherSubject.eraseToAnyPublisher()
     }
@@ -13,6 +16,13 @@ class SessionRequestsProvider {
     }
 
     func emitRequestIfPending() {
+        let now = Date()
+        if let lastEmitTime = lastEmitTime, now.timeIntervalSince(lastEmitTime) < debounceInterval {
+            return
+        }
+
+        self.lastEmitTime = now
+
         if let oldestRequest = self.historyService.getPendingRequestsSortedByTimestamp().first {
             self.sessionRequestPublisherSubject.send(oldestRequest)
         }
diff --git a/Tests/WalletConnectSignTests/AutoNamespacesValidationTests.swift b/Tests/WalletConnectSignTests/AutoNamespacesValidationTests.swift
index 8e2d5260c..f7c65f72d 100644
--- a/Tests/WalletConnectSignTests/AutoNamespacesValidationTests.swift
+++ b/Tests/WalletConnectSignTests/AutoNamespacesValidationTests.swift
@@ -18,15 +18,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!, Blockchain("eip155:3")!],
@@ -64,15 +57,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!, Blockchain("eip155:3")!],
@@ -110,15 +96,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!, Blockchain("eip155:3")!],
@@ -160,15 +139,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!, Blockchain("eip155:3")!],
@@ -215,15 +187,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!, Blockchain("eip155:3")!, Blockchain("eip155:4")!],
@@ -268,15 +233,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!],
@@ -322,15 +280,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!, Blockchain("eip155:4")!],
@@ -371,15 +322,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!, Blockchain("eip155:4")!],
@@ -420,15 +364,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged", "accountsChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!, Blockchain("eip155:4")!],
@@ -470,15 +407,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged", "accountsChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!, Blockchain("eip155:4")!],
@@ -525,15 +455,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged", "accountsChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!, Blockchain("eip155:4")!, Blockchain("cosmos:cosmoshub-4")!],
@@ -585,15 +508,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged", "accountsChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         XCTAssertThrowsError(
             try AutoNamespaces.build(
                 sessionProposal: sessionProposal,
@@ -628,15 +544,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged", "accountsChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         XCTAssertThrowsError(
             try AutoNamespaces.build(
                 sessionProposal: sessionProposal,
@@ -665,15 +574,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged", "accountsChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         XCTAssertThrowsError(
             try AutoNamespaces.build(
                 sessionProposal: sessionProposal,
@@ -702,15 +604,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged", "accountsChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         XCTAssertThrowsError(
             try AutoNamespaces.build(
                 sessionProposal: sessionProposal,
@@ -739,15 +634,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged", "accountsChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         XCTAssertThrowsError(
             try AutoNamespaces.build(
                 sessionProposal: sessionProposal,
@@ -780,15 +668,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged", "accountsChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         XCTAssertThrowsError(
             try AutoNamespaces.build(
                 sessionProposal: sessionProposal,
@@ -817,15 +698,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: []
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!],
@@ -864,15 +738,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: ["chainChanged", "accountsChanged"]
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!],
@@ -911,15 +778,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: []
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!],
@@ -963,15 +823,8 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 events: []
             )
         ]
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: requiredNamespaces,
-            optionalNamespaces: optionalNamespaces,
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
         let sessionNamespaces = try! AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [Blockchain("eip155:1")!, Blockchain("solana:4sGjMW1sUnHzSxGspuhpqLDx6wiyjNtZ")!],
@@ -1001,15 +854,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
     }
 
     func testBuildThrowsWhenSessionNamespacesAreEmpty() {
-        let sessionProposal = Session.Proposal(
-            id: "",
-            pairingTopic: "",
-            proposer: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil)),
-            requiredNamespaces: [:],
-            optionalNamespaces: [:],
-            sessionProperties: nil,
-            proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [], redirect: AppMetadata.Redirect(native: "", universal: nil))), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
-        )
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: [:], optionalNamespaces: [:])
 
         XCTAssertThrowsError(try AutoNamespaces.build(
             sessionProposal: sessionProposal,
@@ -1018,9 +863,250 @@ final class AutoNamespacesValidationTests: XCTestCase {
             events: [],
             accounts: []
         ), "Expected to throw AutoNamespacesError.emtySessionNamespacesForbidden, but it did not") { error in
-            guard case AutoNamespacesError.emtySessionNamespacesForbidden = error else {
+            guard case AutoNamespacesError.emptySessionNamespacesForbidden = error else {
                 return XCTFail("Unexpected error type: \(error)")
             }
         }
     }
+
+    func testAutoNamespacesRequiredChainsNotSatisfied() {
+        let accounts = [Account(blockchain: Blockchain("eip155:1")!, address: "0x123")!]
+        let requiredNamespaces = [
+            "eip155": ProposalNamespace(
+                chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!], // Required chain not supported
+                methods: ["personal_sign"],
+                events: ["chainChanged"])
+        ]
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: [:])
+
+        XCTAssertThrowsError(try AutoNamespaces.build(
+            sessionProposal: sessionProposal,
+            chains: [Blockchain("eip155:1")!], // Only eip155:1 is supported
+            methods: ["personal_sign"],
+            events: ["chainChanged"],
+            accounts: accounts
+        ), "Expected to throw AutoNamespacesError.requiredChainsNotSatisfied, but it did not") { error in
+            guard case AutoNamespacesError.requiredChainsNotSatisfied = error else {
+                return XCTFail("Unexpected error type: \(error)")
+            }
+        }
+    }
+
+    func testValidatingBuiltNamespaces() async {
+        // Setup
+        let accounts = [
+            Account(blockchain: Blockchain("eip155:1")!, address: "0x123")!,
+            Account(blockchain: Blockchain("eip155:2")!, address: "0x456")!
+        ]
+        let requiredNamespaces = [
+            "eip155": ProposalNamespace(
+                chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!],
+                methods: ["personal_sign", "eth_sendTransaction"],
+                events: ["chainChanged"]
+            )
+        ]
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: nil)
+
+        do {
+            // Act
+            let sessionNamespaces = try AutoNamespaces.build(
+                sessionProposal: sessionProposal,
+                chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!],
+                methods: ["personal_sign", "eth_sendTransaction"],
+                events: ["chainChanged"],
+                accounts: accounts
+            )
+
+            // Validate
+            try Namespace.validate(sessionNamespaces)
+
+            // Assert
+            XCTAssertNotNil(sessionNamespaces, "Session namespaces should be successfully built and validated.")
+        } catch {
+            XCTFail("Namespace validation failed with error: \(error)")
+        }
+    }
+
+    func testAutoNamespacesMergingSupersetOfMethodsAndEvents() async {
+        let accounts = [Account(blockchain: Blockchain("eip155:1")!, address: "0x123")!]
+        let requiredNamespaces = [
+            "eip155": ProposalNamespace(
+                chains: [Blockchain("eip155:1")!],
+                methods: ["personal_sign"],
+                events: ["chainChanged"]
+            )
+        ]
+        let optionalNamespaces = [
+            "eip155": ProposalNamespace(
+                chains: [Blockchain("eip155:1")!],
+                methods: ["personal_sign", "eth_sendTransaction", "eth_sign"],
+                events: ["chainChanged", "accountsChanged"]
+            )
+        ]
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
+        let sessionNamespaces = try! AutoNamespaces.build(
+            sessionProposal: sessionProposal,
+            chains: [Blockchain("eip155:1")!],
+            methods: ["personal_sign", "eth_sendTransaction", "eth_sign"],
+            events: ["chainChanged", "accountsChanged"],
+            accounts: accounts
+        )
+
+        let expectedNamespaces: [String: SessionNamespace] = [
+            "eip155": SessionNamespace(
+                chains: [Blockchain("eip155:1")!],
+                accounts: Set(accounts),
+                methods: ["personal_sign", "eth_sendTransaction", "eth_sign"],
+                events: ["chainChanged", "accountsChanged"]
+            )
+        ]
+        XCTAssertEqual(sessionNamespaces, expectedNamespaces)
+    }
+
+    func testAutoNamespacesWithInvalidBlockchainReferences() async {
+        // Setup: Include an invalid blockchain reference in the required namespaces
+        let requiredNamespaces = [
+            "eip155": ProposalNamespace(
+                chains: [Blockchain("eip155:1")!, Blockchain("invalid:999")!],
+                methods: ["personal_sign"],
+                events: ["chainChanged"]
+            )
+        ]
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: [:])
+
+        // Expect the build function to throw an error due to the invalid blockchain reference
+        XCTAssertThrowsError(try AutoNamespaces.build(
+            sessionProposal: sessionProposal,
+            chains: [Blockchain("eip155:1")!],
+            methods: ["personal_sign"],
+            events: ["chainChanged"],
+            accounts: []
+        )) { error in
+            XCTAssertEqual(error as? AutoNamespacesError, AutoNamespacesError.requiredChainsNotSatisfied)
+        }
+    }
+
+    func testAutoNamespacesWithAccountsAcrossDifferentBlockchains() async {
+        // Setup: Accounts on different blockchains and required namespaces that span these blockchains
+        let accounts = [
+            Account(blockchain: Blockchain("eip155:1")!, address: "0x1")!,
+            Account(blockchain: Blockchain("solana:4s")!, address: "0x2")!
+        ]
+        let requiredNamespaces = [
+            "eip155": ProposalNamespace(
+                chains: [Blockchain("eip155:1")!],
+                methods: ["personal_sign"],
+                events: ["chainChanged"]
+            ),
+            "solana": ProposalNamespace(
+                chains: [Blockchain("solana:4s")!],
+                methods: ["solana_sign"],
+                events: ["accountChanged"]
+            )
+        ]
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: [:])
+
+        // Execute: Call the build function with the setup
+        let sessionNamespaces = try! AutoNamespaces.build(
+            sessionProposal: sessionProposal,
+            chains: [Blockchain("eip155:1")!, Blockchain("solana:4s")!],
+            methods: ["personal_sign", "solana_sign"],
+            events: ["chainChanged", "accountChanged"],
+            accounts: accounts
+        )
+
+        // Verify: Each blockchain has its corresponding account in the session namespace
+        XCTAssertTrue(sessionNamespaces["eip155"]?.accounts.contains(accounts[0]) ?? false)
+        XCTAssertTrue(sessionNamespaces["solana"]?.accounts.contains(accounts[1]) ?? false)
+    }
+
+    func testAutoNamespacesWithComplexMergingAndOptionalAccounts() async {
+        // Setup: Complex scenario with overlapping required and optional namespaces, including one without accounts
+        let accounts = [Account(blockchain: Blockchain("eip155:1")!, address: "0x1")!]
+        let requiredNamespaces = [
+            "eip155": ProposalNamespace(
+                chains: [Blockchain("eip155:1")!],
+                methods: ["personal_sign"],
+                events: ["chainChanged"]
+            )
+        ]
+        let optionalNamespaces = [
+            "eip155": ProposalNamespace(
+                chains: [Blockchain("eip155:1")!],
+                methods: ["eth_sendTransaction"],
+                events: ["accountsChanged"]
+            ),
+            "solana": ProposalNamespace(
+                chains: [Blockchain("solana:4s")!],
+                methods: ["solana_sign"],
+                events: ["accountChanged"]
+            )
+        ]
+        let sessionProposal = Session.Proposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+
+        // Execute: Call the build function with the setup
+        let sessionNamespaces = try! AutoNamespaces.build(
+            sessionProposal: sessionProposal,
+            chains: [Blockchain("eip155:1")!, Blockchain("solana:4s")!],
+            methods: ["personal_sign", "eth_sendTransaction", "solana_sign"],
+            events: ["chainChanged", "accountsChanged", "accountChanged"],
+            accounts: accounts
+        )
+
+        // Verify: Proper merging of required and optional namespaces, including method and event merging
+        let eip155Namespace = sessionNamespaces["eip155"]
+        XCTAssertTrue(eip155Namespace?.methods.contains("personal_sign") ?? false)
+        XCTAssertTrue(eip155Namespace?.methods.contains("eth_sendTransaction") ?? false)
+        XCTAssertTrue(eip155Namespace?.events.contains("chainChanged") ?? false)
+        XCTAssertTrue(eip155Namespace?.events.contains("accountsChanged") ?? false)
+
+        // Given the updated understanding, we no longer assert the presence of accounts for each namespace, allowing for 0 or more accounts.
+        let solanaNamespace = sessionNamespaces["solana"]
+        XCTAssertNotNil(solanaNamespace) // Verify namespace exists, but don't enforce accounts
+        XCTAssertTrue(solanaNamespace?.methods.contains("solana_sign") ?? false)
+        XCTAssertTrue(solanaNamespace?.events.contains("accountChanged") ?? false)
+    }
+
+}
+
+
+
+
+
+
+fileprivate extension Session.Proposal {
+    static func stub(
+        requiredNamespaces: [String: ProposalNamespace] = [:],
+        optionalNamespaces: [String: ProposalNamespace]? = nil
+    ) -> Session.Proposal {
+        return Session.Proposal(
+            id: "mockId",
+            pairingTopic: "mockPairingTopic",
+            proposer: AppMetadata.stub(),
+            requiredNamespaces: requiredNamespaces,
+            optionalNamespaces: optionalNamespaces,
+            sessionProperties: nil,
+            proposal: SessionProposal.stub(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
+        )
+    }
+}
+
+fileprivate extension SessionProposal {
+    static func stub(
+        requiredNamespaces: [String: ProposalNamespace] = [:],
+        optionalNamespaces: [String: ProposalNamespace]? = nil,
+        proposerPubKey: String = ""
+    ) -> SessionProposal {
+        return SessionProposal(
+            relays: [],
+            proposer: Participant(
+                publicKey: proposerPubKey,
+                metadata: AppMetadata.stub()
+            ),
+            requiredNamespaces: requiredNamespaces,
+            optionalNamespaces: optionalNamespaces ?? [:],
+            sessionProperties: [:]
+        )
+    }
 }