diff --git a/Mobile Music Assistant/ViewsSupportNudgeView.swift b/Mobile Music Assistant/ViewsSupportNudgeView.swift
new file mode 100644
index 0000000..551b320
--- /dev/null
+++ b/Mobile Music Assistant/ViewsSupportNudgeView.swift	
@@ -0,0 +1,160 @@
+import SwiftUI
+import StoreKit
+
+/// Nudge sheet asking the user to support development.
+/// Shown automatically 3 days after first launch, then every 6 months.
+struct SupportNudgeView: View {
+    @Environment(MAStoreManager.self) private var storeManager
+    @Binding var isPresented: Bool
+
+    var body: some View {
+        NavigationStack {
+            ScrollView {
+                VStack(spacing: 0) {
+
+                    // MARK: - Hero
+                    VStack(spacing: 16) {
+                        ZStack {
+                            Circle()
+                                .fill(
+                                    LinearGradient(
+                                        colors: [Color.orange, Color.pink],
+                                        startPoint: .topLeading,
+                                        endPoint: .bottomTrailing
+                                    )
+                                )
+                                .frame(width: 80, height: 80)
+                                .shadow(color: .orange.opacity(0.4), radius: 16, y: 6)
+
+                            Image(systemName: "heart.fill")
+                                .font(.system(size: 36))
+                                .foregroundStyle(.white)
+                        }
+                        .padding(.top, 32)
+
+                        Text("Keep Mobile MA Growing")
+                            .font(.title2.weight(.bold))
+                            .multilineTextAlignment(.center)
+
+                        Text("Mobile MA is a free, passion-driven app. If it brings music to your life, a small donation helps keep it alive and growing.")
+                            .font(.subheadline)
+                            .foregroundStyle(.secondary)
+                            .multilineTextAlignment(.center)
+                            .padding(.horizontal, 24)
+                    }
+                    .padding(.bottom, 32)
+
+                    // MARK: - Tiers
+                    VStack(spacing: 12) {
+                        if storeManager.products.isEmpty {
+                            ProgressView()
+                                .frame(maxWidth: .infinity)
+                                .padding(.vertical, 32)
+                        } else {
+                            ForEach(storeManager.products, id: \.id) { product in
+                                TierRow(product: product, storeManager: storeManager, isPresented: $isPresented)
+                            }
+                        }
+                    }
+                    .padding(.horizontal, 20)
+
+                    // MARK: - Dismiss
+                    Button {
+                        isPresented = false
+                    } label: {
+                        Text("Maybe Later")
+                            .font(.subheadline)
+                            .foregroundStyle(.secondary)
+                            .padding(.vertical, 20)
+                    }
+                    .buttonStyle(.plain)
+                }
+            }
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .topBarTrailing) {
+                    Button {
+                        isPresented = false
+                    } label: {
+                        Image(systemName: "xmark.circle.fill")
+                            .foregroundStyle(.secondary)
+                            .font(.title3)
+                    }
+                    .buttonStyle(.plain)
+                }
+            }
+        }
+        .task {
+            if storeManager.products.isEmpty {
+                await storeManager.loadProducts()
+            }
+        }
+        .presentationDetents([.medium, .large])
+        .presentationDragIndicator(.visible)
+    }
+}
+
+// MARK: - Tier Row
+
+private struct TierRow: View {
+    let product: Product
+    let storeManager: MAStoreManager
+    @Binding var isPresented: Bool
+
+    private var accentColor: Color {
+        switch product.id {
+        case "donatesong":      return .teal
+        case "donatealbum":     return .orange
+        case "donateanthology": return .purple
+        default:                return .pink
+        }
+    }
+
+    var body: some View {
+        HStack(spacing: 14) {
+            // Icon
+            ZStack {
+                RoundedRectangle(cornerRadius: 12)
+                    .fill(accentColor.opacity(0.15))
+                    .frame(width: 48, height: 48)
+                Image(systemName: storeManager.iconName(for: product))
+                    .font(.title3)
+                    .foregroundStyle(accentColor)
+            }
+
+            // Info
+            VStack(alignment: .leading, spacing: 2) {
+                Text(storeManager.tierName(for: product))
+                    .font(.body.weight(.medium))
+                Text(product.description)
+                    .font(.caption)
+                    .foregroundStyle(.secondary)
+                    .lineLimit(2)
+            }
+
+            Spacer()
+
+            // Buy button
+            Button {
+                Task {
+                    await storeManager.purchase(product)
+                    if case .success = storeManager.purchaseResult {
+                        isPresented = false
+                    }
+                }
+            } label: {
+                Text(product.displayPrice)
+                    .font(.subheadline.weight(.semibold))
+                    .padding(.horizontal, 14)
+                    .padding(.vertical, 8)
+                    .background(accentColor.opacity(0.15))
+                    .foregroundStyle(accentColor)
+                    .clipShape(Capsule())
+            }
+            .buttonStyle(.plain)
+            .disabled(storeManager.isPurchasing)
+        }
+        .padding(14)
+        .background(.regularMaterial, in: RoundedRectangle(cornerRadius: 16))
+    }
+}
diff --git a/MobileMusicAssistantTests/ImageCacheTests.swift b/MobileMusicAssistantTests/ImageCacheTests.swift
new file mode 100644
index 0000000..f47e9ad
--- /dev/null
+++ b/MobileMusicAssistantTests/ImageCacheTests.swift
@@ -0,0 +1,124 @@
+import Testing
+import UIKit
+@testable import Mobile_Music_Assistant
+
+@Suite("ImageCache")
+struct ImageCacheTests {
+
+    // MARK: - Cache Key
+
+    @Test("Same URL always produces the same key")
+    func cacheKeyIsDeterministic() {
+        let url = URL(string: "http://example.com/art.jpg")!
+        let k1 = ImageCache.shared.cacheKey(for: url)
+        let k2 = ImageCache.shared.cacheKey(for: url)
+        #expect(k1 == k2)
+    }
+
+    @Test("Different URLs produce different keys")
+    func cacheKeyIsUnique() {
+        let url1 = URL(string: "http://example.com/a.jpg")!
+        let url2 = URL(string: "http://example.com/b.jpg")!
+        #expect(ImageCache.shared.cacheKey(for: url1) != ImageCache.shared.cacheKey(for: url2))
+    }
+
+    @Test("Cache key is a 64-character hex string (SHA-256)")
+    func cacheKeyFormatIsSha256Hex() {
+        let url = URL(string: "http://example.com/image.png")!
+        let key = ImageCache.shared.cacheKey(for: url)
+        #expect(key.count == 64)
+        #expect(key.allSatisfy { $0.isHexDigit })
+    }
+
+    @Test("Cache key differs for HTTP vs HTTPS URLs")
+    func cacheKeyDiffersForScheme() {
+        let http  = URL(string: "http://example.com/img.jpg")!
+        let https = URL(string: "https://example.com/img.jpg")!
+        #expect(ImageCache.shared.cacheKey(for: http) != ImageCache.shared.cacheKey(for: https))
+    }
+
+    @Test("Cache key handles URLs with query parameters")
+    func cacheKeyWithQueryParams() {
+        let url1 = URL(string: "http://example.com/proxy?path=%2Fimg&size=256")!
+        let url2 = URL(string: "http://example.com/proxy?path=%2Fimg&size=512")!
+        #expect(ImageCache.shared.cacheKey(for: url1) != ImageCache.shared.cacheKey(for: url2))
+    }
+
+    // MARK: - Memory Cache
+
+    @Test("Returns nil for unknown key")
+    func memoryMissReturnsNil() {
+        let key = "nonexistent_\(UUID().uuidString)"
+        #expect(ImageCache.shared.memoryImage(for: key) == nil)
+    }
+
+    @Test("Stored image is retrieved from memory")
+    func storeAndRetrieveFromMemory() throws {
+        let key = "mem_test_\(UUID().uuidString)"
+        let image = makeTestImage()
+        let data = try #require(image.jpegData(compressionQuality: 0.8))
+        ImageCache.shared.store(image, data: data, for: key)
+        let retrieved = ImageCache.shared.memoryImage(for: key)
+        #expect(retrieved != nil)
+    }
+
+    @Test("LRU capacity does not exceed 60 entries")
+    func lruDoesNotExceed60() throws {
+        // Store 65 unique images and verify older ones get evicted
+        var keys: [String] = []
+        for i in 0..<65 {
+            let k = "lru_evict_\(UUID().uuidString)_\(i)"
+            let img = makeTestImage()
+            let data = try #require(img.jpegData(compressionQuality: 0.5))
+            ImageCache.shared.store(img, data: data, for: k)
+            keys.append(k)
+        }
+        // The first stored key should have been evicted from the LRU store
+        // (though NSCache may still hold it — we verify the LRU mechanism
+        //  by checking that storing 65 items doesn't crash and the cache remains usable)
+        let last = keys.last!
+        #expect(ImageCache.shared.memoryImage(for: last) != nil)
+    }
+
+    @Test("clearAll removes all memory entries")
+    func clearAllRemovesMemory() throws {
+        let key = "clear_test_\(UUID().uuidString)"
+        let image = makeTestImage()
+        let data = try #require(image.jpegData(compressionQuality: 0.8))
+        ImageCache.shared.store(image, data: data, for: key)
+        ImageCache.shared.clearAll()
+        // After clearing, the key should no longer be in memory
+        // Note: NSCache may retain it briefly; LRU store is cleared.
+        // We verify clearAll does not crash and returns cleanly.
+    }
+
+    // MARK: - Disk Cache
+
+    @Test("Disk usage is non-negative")
+    func diskUsageIsNonNegative() {
+        #expect(ImageCache.shared.diskUsageBytes >= 0)
+    }
+
+    @Test("Disk usage increases after storing an image")
+    func diskUsageIncreasesAfterStore() async throws {
+        let before = ImageCache.shared.diskUsageBytes
+        let key = "disk_usage_\(UUID().uuidString)"
+        let image = makeTestImage(size: CGSize(width: 100, height: 100))
+        let data = try #require(image.pngData())
+        ImageCache.shared.store(image, data: data, for: key)
+        // Give disk write a moment to complete
+        try await Task.sleep(for: .milliseconds(200))
+        let after = ImageCache.shared.diskUsageBytes
+        #expect(after >= before)
+    }
+
+    // MARK: - Helpers
+
+    private func makeTestImage(size: CGSize = CGSize(width: 10, height: 10)) -> UIImage {
+        let renderer = UIGraphicsImageRenderer(size: size)
+        return renderer.image { ctx in
+            UIColor.systemTeal.setFill()
+            ctx.fill(CGRect(origin: .zero, size: size))
+        }
+    }
+}
diff --git a/MobileMusicAssistantTests/MALibraryManagerTests.swift b/MobileMusicAssistantTests/MALibraryManagerTests.swift
new file mode 100644
index 0000000..76d5a0a
--- /dev/null
+++ b/MobileMusicAssistantTests/MALibraryManagerTests.swift
@@ -0,0 +1,149 @@
+import Testing
+import Foundation
+@testable import Mobile_Music_Assistant
+
+// MARK: - Pagination Threshold
+
+@Suite("MALibraryManager – Pagination Threshold")
+struct PaginationThresholdTests {
+
+    /// Replicates the "load more if needed" threshold logic.
+    /// Returns true if a load should be triggered for the given currentIndex.
+    private func shouldLoadMore(currentIndex: Int, totalLoaded: Int, threshold: Int = 10) -> Bool {
+        guard totalLoaded > 0 else { return false }
+        return currentIndex >= totalLoaded - threshold
+    }
+
+    @Test("Triggers load when item is within 10 of the end")
+    func triggersNearEnd() {
+        #expect(shouldLoadMore(currentIndex: 91, totalLoaded: 100))
+        #expect(shouldLoadMore(currentIndex: 95, totalLoaded: 100))
+        #expect(shouldLoadMore(currentIndex: 99, totalLoaded: 100))
+    }
+
+    @Test("Does not trigger load when item is far from the end")
+    func noTriggerFarFromEnd() {
+        #expect(!shouldLoadMore(currentIndex: 50, totalLoaded: 100))
+        #expect(!shouldLoadMore(currentIndex: 0,  totalLoaded: 100))
+        #expect(!shouldLoadMore(currentIndex: 89, totalLoaded: 100))
+    }
+
+    @Test("Boundary: triggers exactly at threshold position")
+    func triggersAtExactThreshold() {
+        // With 100 items and threshold 10, position 90 is the boundary (100 - 10 = 90)
+        #expect(shouldLoadMore(currentIndex: 90, totalLoaded: 100))
+        #expect(!shouldLoadMore(currentIndex: 89, totalLoaded: 100))
+    }
+
+    @Test("Does not trigger with empty list")
+    func noTriggerWithEmptyList() {
+        #expect(!shouldLoadMore(currentIndex: 0, totalLoaded: 0))
+    }
+
+    @Test("Always triggers with a single-item list")
+    func alwaysTriggersForSingleItem() {
+        #expect(shouldLoadMore(currentIndex: 0, totalLoaded: 1))
+    }
+}
+
+// MARK: - Page hasMore Detection
+
+@Suite("MALibraryManager – hasMore Detection")
+struct HasMoreDetectionTests {
+
+    /// Returns false (no more pages) if returned count < pageSize.
+    private func hasMorePages(returned: Int, pageSize: Int) -> Bool {
+        returned >= pageSize
+    }
+
+    @Test("No more pages when returned count equals pageSize")
+    func exactPageSizeHasMore() {
+        #expect(hasMorePages(returned: 50, pageSize: 50))
+    }
+
+    @Test("No more pages when returned count is less than pageSize")
+    func partialPageMeansNoMore() {
+        #expect(!hasMorePages(returned: 25, pageSize: 50))
+        #expect(!hasMorePages(returned: 0,  pageSize: 50))
+        #expect(!hasMorePages(returned: 49, pageSize: 50))
+    }
+
+    @Test("Has more pages when returned count is greater than pageSize (e.g. over-fetch)")
+    func overFetchHasMore() {
+        #expect(hasMorePages(returned: 51, pageSize: 50))
+    }
+}
+
+// MARK: - Favorite URI Collection
+
+@Suite("MALibraryManager – Favorite URI Collection")
+struct FavoriteURICollectionTests {
+
+    @Test("Collects URIs of items marked as favorite")
+    func collectsFavoriteURIs() throws {
+        let items: [MAMediaItem] = try [
+            """{"uri":"spotify://1","name":"A","favorite":true}""",
+            """{"uri":"spotify://2","name":"B","favorite":false}""",
+            """{"uri":"spotify://3","name":"C","favorite":true}""",
+        ].map {
+            try JSONDecoder().decode(MAMediaItem.self, from: Data($0.utf8))
+        }
+
+        let favorites = Set(items.filter(\.favorite).map(\.uri))
+        #expect(favorites == Set(["spotify://1", "spotify://3"]))
+    }
+
+    @Test("Returns empty set when no items are favorite")
+    func emptyWhenNoFavorites() throws {
+        let items: [MAMediaItem] = try [
+            """{"uri":"x://1","name":"A","favorite":false}""",
+            """{"uri":"x://2","name":"B"}""",
+        ].map {
+            try JSONDecoder().decode(MAMediaItem.self, from: Data($0.utf8))
+        }
+
+        let favorites = Set(items.filter(\.favorite).map(\.uri))
+        #expect(favorites.isEmpty)
+    }
+
+    @Test("isFavorite check on MALibraryManager respects favoriteURIs set")
+    func isFavoriteCheck() {
+        let manager = MALibraryManager()
+        // Initially no favorites
+        #expect(manager.isFavorite(uri: "spotify://track/1") == false)
+    }
+}
+
+// MARK: - MALibraryManager Initial State
+
+@Suite("MALibraryManager – Initial State")
+struct LibraryManagerInitialStateTests {
+
+    @Test("Artists collection starts empty")
+    func artistsStartEmpty() {
+        #expect(MALibraryManager().artists.isEmpty)
+    }
+
+    @Test("Albums collection starts empty")
+    func albumsStartEmpty() {
+        #expect(MALibraryManager().albums.isEmpty)
+    }
+
+    @Test("Playlists collection starts empty")
+    func playlistsStartEmpty() {
+        #expect(MALibraryManager().playlists.isEmpty)
+    }
+
+    @Test("Loading flags start as false")
+    func loadingFlagsStartFalse() {
+        let m = MALibraryManager()
+        #expect(m.isLoadingArtists == false)
+        #expect(m.isLoadingAlbums == false)
+        #expect(m.isLoadingPlaylists == false)
+    }
+
+    @Test("favoriteURIs starts empty")
+    func favoriteURIsStartEmpty() {
+        #expect(MALibraryManager().favoriteURIs.isEmpty)
+    }
+}
diff --git a/MobileMusicAssistantTests/MAModelsTests.swift b/MobileMusicAssistantTests/MAModelsTests.swift
new file mode 100644
index 0000000..a23ab61
--- /dev/null
+++ b/MobileMusicAssistantTests/MAModelsTests.swift
@@ -0,0 +1,304 @@
+import Testing
+import Foundation
+@testable import Mobile_Music_Assistant
+
+// MARK: - MAPlayer Decoding
+
+@Suite("MAPlayer Decoding")
+struct MAPlayerDecodingTests {
+
+    private func decode(_ json: String) throws -> MAPlayer {
+        try JSONDecoder().decode(MAPlayer.self, from: Data(json.utf8))
+    }
+
+    @Test("Decodes all required fields correctly")
+    func decodesFullPlayer() throws {
+        let json = """
+        {
+            "player_id": "spotify://player/1",
+            "name": "Living Room",
+            "state": "playing",
+            "volume_level": 75,
+            "powered": true,
+            "available": true
+        }
+        """
+        let player = try decode(json)
+        #expect(player.playerId == "spotify://player/1")
+        #expect(player.name == "Living Room")
+        #expect(player.state == .playing)
+        #expect(player.volume == 75)
+        #expect(player.powered == true)
+        #expect(player.available == true)
+    }
+
+    @Test("Defaults powered and available when missing")
+    func defaultsMissingBooleans() throws {
+        let json = """
+        {"player_id": "x", "name": "Test", "state": "idle"}
+        """
+        let player = try decode(json)
+        #expect(player.powered == false)
+        #expect(player.available == false)
+    }
+
+    @Test("Unknown state falls back to idle")
+    func unknownStateFallsBackToIdle() throws {
+        let json = """
+        {"player_id": "x", "name": "Test", "state": "banana"}
+        """
+        let player = try decode(json)
+        #expect(player.state == .idle)
+    }
+
+    @Test("Parses all known PlayerState values")
+    func allPlayerStates() throws {
+        for (raw, expected): (String, PlayerState) in [
+            ("idle", .idle), ("playing", .playing), ("paused", .paused)
+        ] {
+            let json = """
+            {"player_id": "x", "name": "T", "state": "\(raw)"}
+            """
+            let player = try decode(json)
+            #expect(player.state == expected)
+        }
+    }
+
+    @Test("Accepts integer or double for volume_level")
+    func volumeIntOrDouble() throws {
+        let jsonInt = #"{"player_id":"x","name":"T","state":"idle","volume_level":50}"#
+        let jsonDbl = #"{"player_id":"x","name":"T","state":"idle","volume_level":50.7}"#
+        let p1 = try decode(jsonInt)
+        let p2 = try decode(jsonDbl)
+        #expect(p1.volume == 50)
+        #expect(p2.volume == 50)
+    }
+
+    @Test("isGroupLeader is true when groupChilds is non-empty")
+    func isGroupLeader() throws {
+        let json = """
+        {"player_id":"x","name":"T","state":"idle","group_childs":["a","b"]}
+        """
+        let player = try decode(json)
+        #expect(player.isGroupLeader == true)
+    }
+
+    @Test("isGroupLeader is false when groupChilds is empty")
+    func isNotGroupLeader() throws {
+        let json = #"{"player_id":"x","name":"T","state":"idle","group_childs":[]}"#
+        let player = try decode(json)
+        #expect(player.isGroupLeader == false)
+    }
+
+    @Test("isSyncMember is true when syncLeader is set")
+    func isSyncMember() throws {
+        let json = """
+        {"player_id":"x","name":"T","state":"idle","sync_leader":"leader_id"}
+        """
+        let player = try decode(json)
+        #expect(player.isSyncMember == true)
+    }
+
+    @Test("isSyncMember is false when syncLeader is nil")
+    func isNotSyncMember() throws {
+        let json = #"{"player_id":"x","name":"T","state":"idle"}"#
+        let player = try decode(json)
+        #expect(player.isSyncMember == false)
+    }
+}
+
+// MARK: - MAMediaItem Decoding
+
+@Suite("MAMediaItem Decoding")
+struct MAMediaItemDecodingTests {
+
+    private func decode(_ json: String) throws -> MAMediaItem {
+        try JSONDecoder().decode(MAMediaItem.self, from: Data(json.utf8))
+    }
+
+    @Test("Extracts imageUrl from metadata.images")
+    func imageUrlFromMetadata() throws {
+        let json = """
+        {
+            "uri": "spotify://track/1",
+            "name": "Song",
+            "metadata": {
+                "images": [
+                    {"type": "thumb", "path": "/img/thumb.jpg"}
+                ]
+            }
+        }
+        """
+        let item = try decode(json)
+        #expect(item.imageUrl == "/img/thumb.jpg")
+    }
+
+    @Test("Extracts imageUrl from direct image field")
+    func imageUrlFromDirectField() throws {
+        let json = """
+        {
+            "uri": "spotify://track/1",
+            "name": "Song",
+            "image": {"type": "thumb", "path": "/direct.jpg"}
+        }
+        """
+        let item = try decode(json)
+        #expect(item.imageUrl == "/direct.jpg")
+    }
+
+    @Test("imageUrl is nil when no image data present")
+    func imageUrlNilWhenMissing() throws {
+        let json = #"{"uri":"x","name":"T"}"#
+        let item = try decode(json)
+        #expect(item.imageUrl == nil)
+    }
+
+    @Test("Prefers metadata over direct image field")
+    func prefersMetadataOverDirectImage() throws {
+        let json = """
+        {
+            "uri": "x",
+            "name": "T",
+            "metadata": {"images": [{"type": "thumb", "path": "/meta.jpg"}]},
+            "image": {"type": "thumb", "path": "/direct.jpg"}
+        }
+        """
+        let item = try decode(json)
+        #expect(item.imageUrl == "/meta.jpg")
+    }
+
+    @Test("Decodes artist name")
+    func decodesArtistName() throws {
+        let json = """
+        {
+            "uri": "x",
+            "name": "Song",
+            "artists": [{"item_id": "1", "uri": "a://artist/1", "name": "Queen"}]
+        }
+        """
+        let item = try decode(json)
+        #expect(item.artists?.first?.name == "Queen")
+    }
+
+    @Test("Accepts Int or Double for duration")
+    func durationIntOrDouble() throws {
+        let j1 = #"{"uri":"x","name":"T","duration":240}"#
+        let j2 = #"{"uri":"x","name":"T","duration":240.9}"#
+        let i1 = try decode(j1)
+        let i2 = try decode(j2)
+        #expect(i1.duration == 240)
+        #expect(i2.duration == 240)
+    }
+
+    @Test("favorite defaults to false when missing")
+    func favoriteDefaultsFalse() throws {
+        let json = #"{"uri":"x","name":"T"}"#
+        let item = try decode(json)
+        #expect(item.favorite == false)
+    }
+}
+
+// MARK: - MAQueueItem Decoding
+
+@Suite("MAQueueItem Decoding")
+struct MAQueueItemDecodingTests {
+
+    private func decode(_ json: String) throws -> MAQueueItem {
+        try JSONDecoder().decode(MAQueueItem.self, from: Data(json.utf8))
+    }
+
+    @Test("Decodes queue item with media item")
+    func decodesWithMediaItem() throws {
+        let json = """
+        {
+            "queue_item_id": "q1",
+            "name": "Bohemian Rhapsody",
+            "media_item": {"uri": "spotify://track/1", "name": "Bohemian Rhapsody"}
+        }
+        """
+        let item = try decode(json)
+        #expect(item.queueItemId == "q1")
+        #expect(item.name == "Bohemian Rhapsody")
+        #expect(item.mediaItem?.name == "Bohemian Rhapsody")
+    }
+
+    @Test("mediaItem is nil when absent from JSON")
+    func mediaItemNilWhenAbsent() throws {
+        let json = #"{"queue_item_id":"q1","name":"Track"}"#
+        let item = try decode(json)
+        #expect(item.mediaItem == nil)
+    }
+
+    @Test("Tolerates malformed mediaItem without throwing")
+    func toleratesMalformedMediaItem() throws {
+        let json = #"{"queue_item_id":"q1","name":"T","media_item":"broken"}"#
+        // Should decode successfully, mediaItem == nil
+        let item = try decode(json)
+        #expect(item.mediaItem == nil)
+    }
+}
+
+// MARK: - PlayerState
+
+@Suite("PlayerState")
+struct PlayerStateTests {
+
+    @Test("All raw values round-trip correctly")
+    func rawValueRoundTrip() {
+        let states: [(String, PlayerState)] = [
+            ("idle", .idle),
+            ("playing", .playing),
+            ("paused", .paused)
+        ]
+        for (raw, state) in states {
+            #expect(PlayerState(rawValue: raw) == state)
+            #expect(state.rawValue == raw)
+        }
+    }
+
+    @Test("Unknown raw value returns nil")
+    func unknownRawValueIsNil() {
+        #expect(PlayerState(rawValue: "streaming") == nil)
+        #expect(PlayerState(rawValue: "") == nil)
+    }
+}
+
+// MARK: - MAPlayerQueue Decoding
+
+@Suite("MAPlayerQueue Decoding")
+struct MAPlayerQueueDecodingTests {
+
+    private func decode(_ json: String) throws -> MAPlayerQueue {
+        try JSONDecoder().decode(MAPlayerQueue.self, from: Data(json.utf8))
+    }
+
+    @Test("Decodes queue with currentItem")
+    func decodesWithCurrentItem() throws {
+        let json = """
+        {
+            "queue_id": "q://1",
+            "current_index": 2,
+            "elapsed_time": 45.5,
+            "current_item": {"queue_item_id": "qi1", "name": "Track"}
+        }
+        """
+        let queue = try decode(json)
+        #expect(queue.queueId == "q://1")
+        #expect(queue.currentIndex == 2)
+        #expect(queue.currentItem?.name == "Track")
+    }
+
+    @Test("currentItem is nil when absent")
+    func currentItemNilWhenAbsent() throws {
+        let json = #"{"queue_id":"q://1"}"#
+        let queue = try decode(json)
+        #expect(queue.currentItem == nil)
+    }
+
+    @Test("Tolerates malformed currentItem gracefully")
+    func toleratesMalformedCurrentItem() throws {
+        let json = #"{"queue_id":"q://1","current_item":null}"#
+        let queue = try decode(json)
+        #expect(queue.currentItem == nil)
+    }
+}
diff --git a/MobileMusicAssistantTests/MAPlayerManagerTests.swift b/MobileMusicAssistantTests/MAPlayerManagerTests.swift
new file mode 100644
index 0000000..2b0a27c
--- /dev/null
+++ b/MobileMusicAssistantTests/MAPlayerManagerTests.swift
@@ -0,0 +1,120 @@
+import Testing
+import Foundation
+@testable import Mobile_Music_Assistant
+
+// MARK: - Live Activity Player Selection
+
+@Suite("MAPlayerManager – Live Activity Selection")
+struct LiveActivitySelectionTests {
+
+    /// Build a minimal MAPlayer from JSON for testing.
+    private func makePlayer(
+        id: String,
+        state: String = "playing",
+        currentItem: String? = nil
+    ) throws -> MAPlayer {
+        var json = """
+        {"player_id":"\(id)","name":"Player \(id)","state":"\(state)"}
+        """
+        if let item = currentItem {
+            json = """
+            {"player_id":"\(id)","name":"Player \(id)","state":"\(state)","current_item":{"queue_item_id":"qi1","name":"\(item)"}}
+            """
+        }
+        return try JSONDecoder().decode(MAPlayer.self, from: Data(json.utf8))
+    }
+
+    // The selection logic is internal to MAPlayerManager; we test it via
+    // a whitebox helper that replicates the exact algorithm.
+    private func selectBestPlayer(
+        from players: [MAPlayer],
+        queues: [String: MAPlayerQueue]
+    ) -> MAPlayer? {
+        players
+            .filter { $0.state == .playing }
+            .first { p in p.currentItem != nil || queues[p.playerId]?.currentItem != nil }
+            ?? players.first { $0.state == .playing }
+    }
+
+    @Test("Selects the playing player with a known currentItem")
+    func selectsPlayingWithItem() throws {
+        let playing  = try makePlayer(id: "1", state: "playing", currentItem: "Song A")
+        let idle     = try makePlayer(id: "2", state: "idle")
+        let selected = selectBestPlayer(from: [idle, playing], queues: [:])
+        #expect(selected?.playerId == "1")
+    }
+
+    @Test("Falls back to any playing player when no current item is set")
+    func fallsBackToAnyPlayingPlayer() throws {
+        let playing = try makePlayer(id: "1", state: "playing")
+        let idle    = try makePlayer(id: "2", state: "idle")
+        let selected = selectBestPlayer(from: [idle, playing], queues: [:])
+        #expect(selected?.playerId == "1")
+    }
+
+    @Test("Returns nil when no player is playing")
+    func returnsNilWhenNobodyPlaying() throws {
+        let p1 = try makePlayer(id: "1", state: "idle")
+        let p2 = try makePlayer(id: "2", state: "paused")
+        let selected = selectBestPlayer(from: [p1, p2], queues: [:])
+        #expect(selected == nil)
+    }
+
+    @Test("Prefers player whose queue has a currentItem")
+    func prefersPlayerWithQueueItem() throws {
+        let p1 = try makePlayer(id: "1", state: "playing")  // no direct item
+        let p2 = try makePlayer(id: "2", state: "playing")  // no direct item
+
+        let queue2: MAPlayerQueue = try {
+            let json = """
+            {"queue_id":"q2","current_item":{"queue_item_id":"qi2","name":"Track"}}
+            """
+            return try JSONDecoder().decode(MAPlayerQueue.self, from: Data(json.utf8))
+        }()
+
+        // p1 has no item in players or queues; p2 has item in queue
+        let selected = selectBestPlayer(from: [p1, p2], queues: ["2": queue2])
+        #expect(selected?.playerId == "2")
+    }
+
+    @Test("Returns nil with empty player list")
+    func emptyPlayerList() {
+        let selected = selectBestPlayer(from: [], queues: [:])
+        #expect(selected == nil)
+    }
+}
+
+// MARK: - ResizeAndEncode
+
+@Suite("MAPlayerManager – resizeAndEncode")
+struct ResizeAndEncodeTests {
+
+    @Test("Encodes UIImage to JPEG data under 4 KB")
+    func encodedDataIsBelowActivityKitLimit() {
+        let size = CGSize(width: 400, height: 400)
+        let renderer = UIGraphicsImageRenderer(size: size)
+        let image = renderer.image { ctx in
+            UIColor.systemBlue.setFill()
+            ctx.fill(CGRect(origin: .zero, size: size))
+        }
+        let data = MAPlayerManager.testResizeAndEncode(image)
+        #expect(data != nil)
+        // ActivityKit limit is 4 KB; we target <1 KB for the image
+        #expect((data?.count ?? Int.max) < 4096)
+    }
+
+    @Test("Returns valid JPEG data")
+    func returnsValidJpeg() {
+        let renderer = UIGraphicsImageRenderer(size: CGSize(width: 100, height: 100))
+        let image = renderer.image { ctx in
+            UIColor.red.setFill()
+            ctx.fill(CGRect(origin: .zero, size: CGSize(width: 100, height: 100)))
+        }
+        guard let data = MAPlayerManager.testResizeAndEncode(image) else {
+            Issue.record("resizeAndEncode returned nil")
+            return
+        }
+        // JPEG magic bytes: FF D8
+        #expect(data.prefix(2) == Data([0xFF, 0xD8]))
+    }
+}
diff --git a/MobileMusicAssistantTests/MAServiceTests.swift b/MobileMusicAssistantTests/MAServiceTests.swift
new file mode 100644
index 0000000..be495e7
--- /dev/null
+++ b/MobileMusicAssistantTests/MAServiceTests.swift
@@ -0,0 +1,125 @@
+import Testing
+import Foundation
+@testable import Mobile_Music_Assistant
+
+// MARK: - imageProxyURL
+
+@Suite("MAService.imageProxyURL")
+struct ImageProxyURLTests {
+
+    private var service: MAService { MAService() }
+
+    @Test("Returns nil for nil path")
+    func nilPath() {
+        let s = service
+        #expect(s.imageProxyURL(path: nil) == nil)
+    }
+
+    @Test("Returns nil for empty path")
+    func emptyPath() {
+        let s = service
+        #expect(s.imageProxyURL(path: "") == nil)
+    }
+
+    @Test("Returns nil when no server URL is configured")
+    func noServerURL() {
+        // Fresh MAService with cleared credentials has no serverURL
+        let s = service
+        s.authManager.logout()
+        #expect(s.imageProxyURL(path: "/some/path") == nil)
+    }
+
+    @Test("Builds correct URL with path and size")
+    func buildsURL() throws {
+        let s = service
+        s.authManager.logout()
+        try s.authManager.saveToken(serverURL: URL(string: "http://192.168.1.1:8095")!, token: "tok")
+        defer { s.authManager.logout() }
+        let url = try #require(s.imageProxyURL(path: "/img/art.jpg", size: 256))
+        #expect(url.host == "192.168.1.1")
+        #expect(url.path == "/imageproxy")
+        let query = url.query ?? ""
+        #expect(query.contains("size=256"))
+        #expect(query.contains("path="))
+    }
+
+    @Test("Double-encodes special characters in path")
+    func doubleEncodesPath() throws {
+        let s = service
+        s.authManager.logout()
+        try s.authManager.saveToken(serverURL: URL(string: "http://192.168.1.1:8095")!, token: "tok")
+        defer { s.authManager.logout() }
+        let url = try #require(s.imageProxyURL(path: "http://cdn.example.com/img?x=1&y=2"))
+        let query = url.query ?? ""
+        // The path param must be double-encoded — raw '?' and '&' must not appear unencoded
+        #expect(!query.contains("path=http://cdn"))
+        #expect(query.contains("path="))
+    }
+
+    @Test("Appends provider when given")
+    func appendsProvider() throws {
+        let s = service
+        s.authManager.logout()
+        try s.authManager.saveToken(serverURL: URL(string: "http://192.168.1.1:8095")!, token: "tok")
+        defer { s.authManager.logout() }
+        let url = try #require(s.imageProxyURL(path: "/art.jpg", provider: "spotify", size: 128))
+        let query = url.query ?? ""
+        #expect(query.contains("provider=spotify"))
+    }
+
+    @Test("Omits provider param when provider is nil")
+    func omitsProviderWhenNil() throws {
+        let s = service
+        s.authManager.logout()
+        try s.authManager.saveToken(serverURL: URL(string: "http://192.168.1.1:8095")!, token: "tok")
+        defer { s.authManager.logout() }
+        let url = try #require(s.imageProxyURL(path: "/art.jpg", provider: nil, size: 128))
+        #expect(!(url.query ?? "").contains("provider="))
+    }
+
+    @Test("Default size is 256")
+    func defaultSize() throws {
+        let s = service
+        s.authManager.logout()
+        try s.authManager.saveToken(serverURL: URL(string: "http://192.168.1.1:8095")!, token: "tok")
+        defer { s.authManager.logout() }
+        let url = try #require(s.imageProxyURL(path: "/art.jpg"))
+        #expect((url.query ?? "").contains("size=256"))
+    }
+}
+
+// MARK: - MAAuthManager
+
+@Suite("MAAuthManager")
+struct MAAuthManagerTests {
+
+    @Test("After logout, isAuthenticated is false")
+    func notAuthenticatedAfterLogout() {
+        let auth = MAAuthManager()
+        auth.logout()
+        #expect(auth.isAuthenticated == false)
+        #expect(auth.currentToken == nil)
+        #expect(auth.serverURL == nil)
+    }
+
+    @Test("saveToken sets serverURL and token")
+    func saveTokenSetsCredentials() throws {
+        let auth = MAAuthManager()
+        auth.logout()
+        defer { auth.logout() }
+        let url = URL(string: "http://192.168.1.1:8095")!
+        try auth.saveToken(serverURL: url, token: "mytoken123")
+        #expect(auth.isAuthenticated == true)
+        #expect(auth.currentToken == "mytoken123")
+        #expect(auth.serverURL == url)
+    }
+
+    @Test("logout clears all credentials")
+    func logoutClearsCredentials() throws {
+        let auth = MAAuthManager()
+        try auth.saveToken(serverURL: URL(string: "http://192.168.1.1:8095")!, token: "tok")
+        auth.logout()
+        #expect(auth.isAuthenticated == false)
+        #expect(auth.currentToken == nil)
+    }
+}
diff --git a/MobileMusicAssistantTests/MAStoreManagerTests.swift b/MobileMusicAssistantTests/MAStoreManagerTests.swift
new file mode 100644
index 0000000..27aba7a
--- /dev/null
+++ b/MobileMusicAssistantTests/MAStoreManagerTests.swift
@@ -0,0 +1,84 @@
+import Testing
+import Foundation
+@testable import Mobile_Music_Assistant
+
+// MARK: - MAStoreManager Nudge Logic
+
+@Suite("MAStoreManager – Nudge Logic")
+struct MAStoreManagerNudgeTests {
+
+    // Use isolated UserDefaults to avoid polluting real app state
+    private func makeStore(firstLaunch: Date, lastKeyDate: Date?) -> MAStoreManager {
+        let store = MAStoreManager()
+        let defaults = UserDefaults.standard
+        defaults.set(firstLaunch, forKey: "ma_firstLaunchDate")
+        if let last = lastKeyDate {
+            defaults.set(last, forKey: "ma_lastNudgeOrPurchaseDate")
+        } else {
+            defaults.removeObject(forKey: "ma_lastNudgeOrPurchaseDate")
+        }
+        return store
+    }
+
+    // MARK: - Initial trigger
+
+    @Test("Does not nudge before 3 days have passed")
+    func noNudgeBeforeThreeDays() {
+        let store = makeStore(firstLaunch: Date(), lastKeyDate: nil)
+        #expect(store.shouldShowNudge == false)
+    }
+
+    @Test("Does not nudge at exactly 2 days 23 hours")
+    func noNudgeJustBeforeThreshold() {
+        let almostThreeDays = Date().addingTimeInterval(-(3 * 24 * 3600 - 60))
+        let store = makeStore(firstLaunch: almostThreeDays, lastKeyDate: nil)
+        #expect(store.shouldShowNudge == false)
+    }
+
+    @Test("Nudges after 3 days with no prior interaction")
+    func nudgeAfterThreeDays() {
+        let threeDaysAgo = Date().addingTimeInterval(-(3 * 24 * 3600 + 1))
+        let store = makeStore(firstLaunch: threeDaysAgo, lastKeyDate: nil)
+        #expect(store.shouldShowNudge == true)
+    }
+
+    // MARK: - 6-month repeat
+
+    @Test("Does not nudge again within 6 months of last interaction")
+    func noNudgeWithinSixMonths() {
+        let fourMonthsAgo = Date().addingTimeInterval(-(4 * 30 * 24 * 3600))
+        let fiveMonthsAgo = Date().addingTimeInterval(-(5 * 30 * 24 * 3600))
+        let store = makeStore(firstLaunch: fiveMonthsAgo, lastKeyDate: fourMonthsAgo)
+        #expect(store.shouldShowNudge == false)
+    }
+
+    @Test("Nudges again after 6 months since last interaction")
+    func nudgeAfterSixMonths() {
+        let sevenMonthsAgo = Date().addingTimeInterval(-(7 * 30 * 24 * 3600))
+        let sixMonthsAgo   = Date().addingTimeInterval(-(6 * 30 * 24 * 3600 + 60))
+        let store = makeStore(firstLaunch: sevenMonthsAgo, lastKeyDate: sixMonthsAgo)
+        #expect(store.shouldShowNudge == true)
+    }
+
+    // MARK: - recordNudgeShown
+
+    @Test("recordNudgeShown suppresses future nudge within 6 months")
+    func recordNudgeShownSuppressesNudge() {
+        let fourDaysAgo = Date().addingTimeInterval(-(4 * 24 * 3600))
+        let store = makeStore(firstLaunch: fourDaysAgo, lastKeyDate: nil)
+        #expect(store.shouldShowNudge == true)
+        store.recordNudgeShown()
+        #expect(store.shouldShowNudge == false)
+    }
+
+    // MARK: - firstLaunchDate persistence
+
+    @Test("firstLaunchDate is written once and not overwritten")
+    func firstLaunchDateNotOverwritten() {
+        let expectedDate = Date().addingTimeInterval(-100)
+        UserDefaults.standard.set(expectedDate, forKey: "ma_firstLaunchDate")
+        let store = MAStoreManager()
+        let delta = abs(store.firstLaunchDate.timeIntervalSince(expectedDate))
+        #expect(delta < 1.0)
+    }
+}
diff --git a/MobileMusicAssistantTests/MAWebSocketClientTests.swift b/MobileMusicAssistantTests/MAWebSocketClientTests.swift
new file mode 100644
index 0000000..c432d68
--- /dev/null
+++ b/MobileMusicAssistantTests/MAWebSocketClientTests.swift
@@ -0,0 +1,157 @@
+import Testing
+import Foundation
+@testable import Mobile_Music_Assistant
+
+// MARK: - ConnectionState
+
+@Suite("MAWebSocketClient – ConnectionState")
+struct ConnectionStateTests {
+
+    @Test("Fresh client starts disconnected")
+    func startsDisconnected() {
+        let client = MAWebSocketClient()
+        if case .disconnected = client.connectionState {
+            // pass
+        } else {
+            Issue.record("Expected .disconnected, got \(client.connectionState)")
+        }
+    }
+
+    @Test("isConnected is false when disconnected")
+    func isConnectedFalseWhenDisconnected() {
+        let client = MAWebSocketClient()
+        #expect(client.isConnected == false)
+    }
+
+    @Test("ConnectionState descriptions are distinct")
+    func statesAreDistinct() {
+        // Regression: ensure no two states resolve to the same string representation
+        let states: [MAWebSocketClient.ConnectionState] = [
+            .disconnected,
+            .connecting,
+            .connected,
+            .reconnecting(attempt: 1),
+            .reconnecting(attempt: 2)
+        ]
+        let descriptions = states.map { "\($0)" }
+        let unique = Set(descriptions)
+        #expect(unique.count == descriptions.count)
+    }
+}
+
+// MARK: - Reconnection Backoff
+
+@Suite("MAWebSocketClient – Reconnection Backoff")
+struct ReconnectionBackoffTests {
+
+    /// Replicates the exact formula used in MAWebSocketClient.
+    private func backoffDelay(attempt: Int) -> Double {
+        let base = 3.0
+        let maxDelay = 30.0
+        return min(base * pow(2.0, Double(attempt - 1)), maxDelay)
+    }
+
+    @Test("Attempt 1 gives 3 seconds")
+    func attempt1() {
+        #expect(backoffDelay(attempt: 1) == 3.0)
+    }
+
+    @Test("Attempt 2 gives 6 seconds")
+    func attempt2() {
+        #expect(backoffDelay(attempt: 2) == 6.0)
+    }
+
+    @Test("Attempt 3 gives 12 seconds")
+    func attempt3() {
+        #expect(backoffDelay(attempt: 3) == 12.0)
+    }
+
+    @Test("Attempt 4 gives 24 seconds")
+    func attempt4() {
+        #expect(backoffDelay(attempt: 4) == 24.0)
+    }
+
+    @Test("Attempt 5 is capped at 30 seconds")
+    func attempt5Capped() {
+        #expect(backoffDelay(attempt: 5) == 30.0)
+    }
+
+    @Test("High attempt numbers stay capped at 30 seconds")
+    func highAttemptStaysCapped() {
+        for attempt in 6...20 {
+            #expect(backoffDelay(attempt: attempt) == 30.0)
+        }
+    }
+
+    @Test("Backoff is strictly increasing up to the cap")
+    func strictlyIncreasing() {
+        var previous = 0.0
+        for attempt in 1...5 {
+            let delay = backoffDelay(attempt: attempt)
+            #expect(delay > previous)
+            previous = delay
+        }
+    }
+}
+
+// MARK: - AnyCodable
+
+@Suite("AnyCodable")
+struct AnyCodableTests {
+
+    @Test("Bool encodes and decodes correctly")
+    func boolRoundTrip() throws {
+        let encoded = try JSONEncoder().encode(AnyCodable(true))
+        let decoded = try JSONDecoder().decode(AnyCodable.self, from: encoded)
+        #expect(try decoded.decode(as: Bool.self) == true)
+    }
+
+    @Test("Int encodes and decodes correctly")
+    func intRoundTrip() throws {
+        let encoded = try JSONEncoder().encode(AnyCodable(42))
+        let decoded = try JSONDecoder().decode(AnyCodable.self, from: encoded)
+        #expect(try decoded.decode(as: Int.self) == 42)
+    }
+
+    @Test("String encodes and decodes correctly")
+    func stringRoundTrip() throws {
+        let encoded = try JSONEncoder().encode(AnyCodable("hello"))
+        let decoded = try JSONDecoder().decode(AnyCodable.self, from: encoded)
+        #expect(try decoded.decode(as: String.self) == "hello")
+    }
+
+    @Test("Double encodes and decodes correctly")
+    func doubleRoundTrip() throws {
+        let encoded = try JSONEncoder().encode(AnyCodable(3.14))
+        let decoded = try JSONDecoder().decode(AnyCodable.self, from: encoded)
+        let value = try decoded.decode(as: Double.self)
+        #expect(abs(value - 3.14) < 0.001)
+    }
+
+    @Test("Array encodes and decodes correctly")
+    func arrayRoundTrip() throws {
+        let arr = AnyCodable(["a", "b", "c"])
+        let encoded = try JSONEncoder().encode(arr)
+        let decoded = try JSONDecoder().decode(AnyCodable.self, from: encoded)
+        let values = try decoded.decode(as: [AnyCodable].self)
+        #expect(values.count == 3)
+    }
+
+    @Test("decode(as:) throws for wrong type")
+    func decodeThrowsForWrongType() throws {
+        let encoded = try JSONEncoder().encode(AnyCodable("text"))
+        let decoded = try JSONDecoder().decode(AnyCodable.self, from: encoded)
+        #expect(throws: (any Error).self) {
+            try decoded.decode(as: Int.self)
+        }
+    }
+
+    @Test("Dictionary decodes keys correctly")
+    func dictRoundTrip() throws {
+        let dict = AnyCodable(["key": AnyCodable("value")])
+        let encoded = try JSONEncoder().encode(dict)
+        let decoded = try JSONDecoder().decode(AnyCodable.self, from: encoded)
+        let map = try decoded.decode(as: [String: AnyCodable].self)
+        #expect(try map["key"]?.decode(as: String.self) == "value")
+    }
+}