diff --git a/DXFeedFramework.xcodeproj/project.pbxproj b/DXFeedFramework.xcodeproj/project.pbxproj
index f0565aa9f..8a8a2b243 100644
--- a/DXFeedFramework.xcodeproj/project.pbxproj
+++ b/DXFeedFramework.xcodeproj/project.pbxproj
@@ -109,6 +109,7 @@
 		642DC9432AAA299800974F5C /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 646979712A3B5AF60003A9BA /* Colors.xcassets */; };
 		642DC9442AAA29EA00974F5C /* IpfCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 642DC9402AAA290300974F5C /* IpfCell.swift */; };
 		6433B12D2BCE7ADD004EFED7 /* DXFeed+LastEvents.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6433B12C2BCE7ADD004EFED7 /* DXFeed+LastEvents.swift */; };
+		6433B1322BCFC01F004EFED7 /* DXLastEventsSubscribedTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6433B1312BCFC01F004EFED7 /* DXLastEventsSubscribedTest.swift */; };
 		64437A8F2A9DEE6F005929B2 /* InstrumentProfile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64437A8E2A9DEE6F005929B2 /* InstrumentProfile.swift */; };
 		64437A922A9DF1DE005929B2 /* NativeInstrumentProfileReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64437A912A9DF1DE005929B2 /* NativeInstrumentProfileReader.swift */; };
 		6447A5DB2A8E559000739CCF /* ILastingEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6447A5DA2A8E559000739CCF /* ILastingEvent.swift */; };
@@ -665,6 +666,7 @@
 		642DC9402AAA290300974F5C /* IpfCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IpfCell.swift; sourceTree = "<group>"; };
 		6433B12C2BCE7ADD004EFED7 /* DXFeed+LastEvents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DXFeed+LastEvents.swift"; sourceTree = "<group>"; };
 		6433B1302BCE87D4004EFED7 /* RequestProfile.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = RequestProfile.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
+		6433B1312BCFC01F004EFED7 /* DXLastEventsSubscribedTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DXLastEventsSubscribedTest.swift; sourceTree = "<group>"; };
 		6435EE3C2B1F1E9200E8496C /* PrintQuoteEvents.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = PrintQuoteEvents.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		64437A8E2A9DEE6F005929B2 /* InstrumentProfile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InstrumentProfile.swift; sourceTree = "<group>"; };
 		64437A912A9DF1DE005929B2 /* NativeInstrumentProfileReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativeInstrumentProfileReader.swift; sourceTree = "<group>"; };
@@ -1641,6 +1643,7 @@
 				641C64B32B347C430023CFAD /* DXObservableSubscriptionTest.swift */,
 				6423E4682B457000006B208D /* DXTimeSeriesSubscriptionTest.swift */,
 				646064E92B4D8973009201E2 /* DXLastEventTest.swift */,
+				6433B1312BCFC01F004EFED7 /* DXLastEventsSubscribedTest.swift */,
 				64EAA1A12B7A38F8005087BC /* DXPromiseTest.swift */,
 				64DF09342BC924AB009F1486 /* DXAsyncLastTest.swift */,
 				64EAA1A52B838ED3005087BC /* DXSnapshotProcessorTest.swift */,
@@ -2176,6 +2179,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		64656F632A1BB22E006A0B19 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -2591,6 +2595,7 @@
 				649813C42ADD5CB2003CE3B3 /* TestEndpoointStateListener.swift in Sources */,
 				641C64B42B347C430023CFAD /* DXObservableSubscriptionTest.swift in Sources */,
 				64ACBCEC2A29FE2300032C53 /* XCTestCase+Utils.swift in Sources */,
+				6433B1322BCFC01F004EFED7 /* DXLastEventsSubscribedTest.swift in Sources */,
 				6423E4692B457000006B208D /* DXTimeSeriesSubscriptionTest.swift in Sources */,
 				64ECD67F2A9CF4CB00B36935 /* IPFTests.swift in Sources */,
 				64ACBCD52A2789EF00032C53 /* TestListener.swift in Sources */,
diff --git a/DXFeedFramework/Api/Osub/TimeSeriesSubscriptionSymbol.swift b/DXFeedFramework/Api/Osub/TimeSeriesSubscriptionSymbol.swift
index fb66c667e..904df0b0d 100644
--- a/DXFeedFramework/Api/Osub/TimeSeriesSubscriptionSymbol.swift
+++ b/DXFeedFramework/Api/Osub/TimeSeriesSubscriptionSymbol.swift
@@ -52,7 +52,9 @@ public class TimeSeriesSubscriptionSymbol: GenericIndexedEventSubscriptionSymbol
 
     /// Custom symbol has to return string representation.
     public override var stringValue: String {
-        return "\(symbol.description){fromTime=\((try? DXTimeFormat.defaultTimeFormat?.withMillis?.format(value: fromTime)) ?? "")}"
+        return """
+\(symbol.description){fromTime=\((try? DXTimeFormat.defaultTimeFormat?.withMillis?.format(value: fromTime)) ?? "")}
+"""
     }
 }
 
diff --git a/DXFeedFramework/Native/Feed/NativeFeed.swift b/DXFeedFramework/Native/Feed/NativeFeed.swift
index 82dac324b..3e177c326 100644
--- a/DXFeedFramework/Native/Feed/NativeFeed.swift
+++ b/DXFeedFramework/Native/Feed/NativeFeed.swift
@@ -101,96 +101,6 @@ class NativeFeed {
         return event?.lastingEvent
     }
 
-    func getLastEventIfSubscribed(type: IEventType.Type, symbol: Symbol) throws -> ILastingEvent? {
-        let thread = currentThread()
-        let converted = SymbolMapper.newNative(symbol)
-        defer {
-            if let converted = converted {
-                SymbolMapper.clearNative(symbol: converted)
-            }
-        }
-        do {
-            let result = try ErrorCheck.nativeCall(thread,
-                                                   dxfg_DXFeed_getLastEventIfSubscribed(thread,
-                                                                                        feed,
-                                                                                        type.type.nativeCode(),
-                                                                                        converted))
-            return try mapper.fromNative(native: result)?.lastingEvent
-        } catch GraalException.nullException {
-            return nil
-        }
-    }
-
-    func getIndexedEventsIfSubscribed(type: IEventType.Type,
-                                      symbol: Symbol,
-                                      source: IndexedEventSource) throws -> [IIndexedEvent]? {
-        let thread = currentThread()
-        let converted = SymbolMapper.newNative(symbol)
-        defer {
-            if let converted = converted {
-                SymbolMapper.clearNative(symbol: converted)
-            }
-        }
-        do {
-            let result = try ErrorCheck.nativeCall(thread,
-                                                   dxfg_DXFeed_getIndexedEventsIfSubscribed(thread,
-                                                                                            feed,
-                                                                                            type.type.nativeCode(),
-                                                                                            converted,
-                                                                                            source.name.toCStringRef()))
-            if result.pointee.size == 0 {
-                return nil
-            } else {
-                let events: [IIndexedEvent] =
-                (0..<Int(result.pointee.size)).compactMap { index in
-                    guard let nativeElement = result.pointee.elements[index] else { return nil }
-                    let event = try? mapper.fromNative(native: nativeElement)
-                    return event?.indexedEvent
-                }
-                return events
-
-            }
-        } catch GraalException.nullException {
-            return nil
-        }
-    }
-
-    func getTimeSeriesIfSubscribed(type: IEventType.Type,
-                                   symbol: Symbol,
-                                   fromTime: Long,
-                                   toTime: Long) throws -> [ITimeSeriesEvent]? {
-        let thread = currentThread()
-        let converted = SymbolMapper.newNative(symbol)
-        defer {
-            if let converted = converted {
-                SymbolMapper.clearNative(symbol: converted)
-            }
-        }
-        do {
-            let result = try ErrorCheck.nativeCall(thread,
-                                                   dxfg_DXFeed_getTimeSeriesIfSubscribed(thread,
-                                                                                         feed,
-                                                                                         type.type.nativeCode(),
-                                                                                         converted,
-                                                                                         fromTime,
-                                                                                         toTime))
-            if result.pointee.size == 0 {
-                return nil
-            } else {
-                let events: [ITimeSeriesEvent] =
-                (0..<Int(result.pointee.size)).compactMap { index in
-                    guard let nativeElement = result.pointee.elements[index] else { return nil }
-                    let event = try? mapper.fromNative(native: nativeElement)
-                    return event?.timeSeriesEvent
-                }
-                return events
-
-            }
-        } catch GraalException.nullException {
-            return nil
-        }
-    }
-
     func getLastEvents(types: [MarketEvent]) throws -> [ILastingEvent] {
         let listPointer = UnsafeMutablePointer<dxfg_event_type_list>.allocate(capacity: 1)
         listPointer.pointee.size = Int32(types.count)
@@ -316,7 +226,9 @@ class NativeFeed {
                                                                                 toTime))
         return NativePromise(promise: &native.pointee.base)
     }
+}
 
+extension NativeFeed {
     func attach(subscription: NativeSubscription) throws {
         let thread = currentThread()
         try ErrorCheck.nativeCall(thread,
@@ -333,3 +245,96 @@ class NativeFeed {
                                                                  subscription.subscription))
     }
 }
+
+extension NativeFeed {
+    func getLastEventIfSubscribed(type: IEventType.Type, symbol: Symbol) throws -> ILastingEvent? {
+        let thread = currentThread()
+        let converted = SymbolMapper.newNative(symbol)
+        defer {
+            if let converted = converted {
+                SymbolMapper.clearNative(symbol: converted)
+            }
+        }
+        do {
+            let result = try ErrorCheck.nativeCall(thread,
+                                                   dxfg_DXFeed_getLastEventIfSubscribed(thread,
+                                                                                        feed,
+                                                                                        type.type.nativeCode(),
+                                                                                        converted))
+            return try mapper.fromNative(native: result)?.lastingEvent
+        } catch GraalException.nullException {
+            return nil
+        }
+    }
+
+    func getIndexedEventsIfSubscribed(type: IEventType.Type,
+                                      symbol: Symbol,
+                                      source: IndexedEventSource) throws -> [IIndexedEvent]? {
+        let thread = currentThread()
+        let converted = SymbolMapper.newNative(symbol)
+        defer {
+            if let converted = converted {
+                SymbolMapper.clearNative(symbol: converted)
+            }
+        }
+        do {
+            let result = try ErrorCheck.nativeCall(thread,
+                                                   dxfg_DXFeed_getIndexedEventsIfSubscribed(thread,
+                                                                                            feed,
+                                                                                            type.type.nativeCode(),
+                                                                                            converted,
+                                                                                            source.name.toCStringRef()))
+            if result.pointee.size == 0 {
+                return nil
+            } else {
+                let events: [IIndexedEvent] =
+                (0..<Int(result.pointee.size)).compactMap { index in
+                    guard let nativeElement = result.pointee.elements[index] else { return nil }
+                    let event = try? mapper.fromNative(native: nativeElement)
+                    return event?.indexedEvent
+                }
+                return events
+
+            }
+        } catch GraalException.nullException {
+            return nil
+        }
+    }
+
+    func getTimeSeriesIfSubscribed(type: IEventType.Type,
+                                   symbol: Symbol,
+                                   fromTime: Long,
+                                   toTime: Long) throws -> [ITimeSeriesEvent]? {
+        let thread = currentThread()
+        let converted = SymbolMapper.newNative(symbol)
+        defer {
+            if let converted = converted {
+                SymbolMapper.clearNative(symbol: converted)
+            }
+        }
+        do {
+            let result = try ErrorCheck.nativeCall(thread,
+                                                   dxfg_DXFeed_getTimeSeriesIfSubscribed(thread,
+                                                                                         feed,
+                                                                                         type.type.nativeCode(),
+                                                                                         converted,
+                                                                                         fromTime,
+                                                                                         toTime))
+            if result.pointee.size == 0 {
+                return nil
+            } else {
+                let events: [ITimeSeriesEvent] =
+                (0..<Int(result.pointee.size)).compactMap { index in
+                    guard let nativeElement = result.pointee.elements[index] else { return nil }
+                    let event = try? mapper.fromNative(native: nativeElement)
+                    return event?.timeSeriesEvent
+                }
+                return events
+
+            }
+        } catch GraalException.nullException {
+            return nil
+        }
+    }
+
+}
diff --git a/DXFeedFrameworkTests/CandleTests.swift b/DXFeedFrameworkTests/CandleTests.swift
index ab93106bf..5eaf4c99d 100644
--- a/DXFeedFrameworkTests/CandleTests.swift
+++ b/DXFeedFrameworkTests/CandleTests.swift
@@ -264,7 +264,9 @@ final class CandleTests: XCTestCase {
 
         XCTAssertEqual("EUR/USD{=2h,price=bid,source=bank}",
                        CandleSymbol.valueOf("EUR/USD{source=bank}",
-                                            [CandlePrice.bid, CandlePeriod.valueOf(value: 2, type: CandleType.hour)]).toString())
+                                            [CandlePrice.bid,
+                                             CandlePeriod.valueOf(value: 2, type: CandleType.hour)]
+                                           ).toString())
         XCTAssertEqual("IBM{=15m,aa=zz,price=bid}",
                        CandleSymbol.valueOf("IBM{aa=zz,price=b}",
                                             [CandlePeriod.valueOf(value: 15, type: CandleType.minute)]).toString())
diff --git a/DXFeedFrameworkTests/DXAttachTest.swift b/DXFeedFrameworkTests/DXAttachTest.swift
index c56f31c59..1bc25c224 100644
--- a/DXFeedFrameworkTests/DXAttachTest.swift
+++ b/DXFeedFrameworkTests/DXAttachTest.swift
@@ -11,59 +11,63 @@ import XCTest
 final class DXAttachTest: XCTestCase {
     let detachedSymbol = "TEST1"
     let attachedSymbol = "TEST2"
+    var endpoint: DXEndpoint!
+    var feed: DXFeed!
+    var publisher: DXPublisher!
+
+    override func setUpWithError() throws {
+        endpoint = try DXEndpoint.create()
+        feed = endpoint.getFeed()
+        publisher = endpoint.getPublisher()
+    }
 
     func testAttachDetach() throws {
-        let endpoint = try DXEndpoint.create()
         do {
-            if let feed = endpoint.getFeed(), let publisher = endpoint.getPublisher() {
-                let subcription = try feed.createSubscription([TimeAndSale.self])
-                let expectation1 = expectation(description: "Events received")
-                let expectation2 = expectation(description: "Events received")
-                let listener = AnonymousClass { anonymCl in
-                    anonymCl.callback = { events in
-                        events.forEach { event in
-                            switch event.eventSymbol {
-                            case self.detachedSymbol:
-                                XCTFail("Received detached symbol \(event.toString())")
-                            case self.attachedSymbol:
-                                if event.timeAndSale.askPrice == 100 {
-                                    expectation1.fulfill()
-                                } else if event.timeAndSale.askPrice == 200 {
-                                    expectation2.fulfill()
-                                }
-                            default:
-                                XCTFail("Unexpected symbol \(event.toString())")
+            let subcription = try feed.createSubscription([TimeAndSale.self])
+            let expectation1 = expectation(description: "Events received")
+            let expectation2 = expectation(description: "Events received")
+            let listener = AnonymousClass { anonymCl in
+                anonymCl.callback = { events in
+                    events.forEach { event in
+                        switch event.eventSymbol {
+                        case self.detachedSymbol:
+                            XCTFail("Received detached symbol \(event.toString())")
+                        case self.attachedSymbol:
+                            if event.timeAndSale.askPrice == 100 {
+                                expectation1.fulfill()
+                            } else if event.timeAndSale.askPrice == 200 {
+                                expectation2.fulfill()
                             }
+                        default:
+                            XCTFail("Unexpected symbol \(event.toString())")
                         }
                     }
-                    return anonymCl
                 }
-                try subcription.add(listener: listener)
-                try subcription.addSymbols(detachedSymbol)
-                try feed.detach(subscription: subcription)
-                try publisher.publish(events: [TimeAndSale(detachedSymbol)])
-                try feed.attach(subscription: subcription)
-                try feed.attach(subscription: subcription)
-                try subcription.addSymbols(attachedSymbol)
+                return anonymCl
+            }
+            try subcription.add(listener: listener)
+            try subcription.addSymbols(detachedSymbol)
+            try feed.detach(subscription: subcription)
+            try publisher.publish(events: [TimeAndSale(detachedSymbol)])
+            try feed.attach(subscription: subcription)
+            try feed.attach(subscription: subcription)
+            try subcription.addSymbols(attachedSymbol)
 
-                try publisher.publish(events: [TimeAndSale(attachedSymbol).also(block: { tns in
-                    tns.askPrice = 100
-                })])
-                wait(for: [expectation1], timeout: 1)
-                try subcription.detach(feed: feed)
-                try publisher.publish(events: [TimeAndSale(detachedSymbol)])
-                try subcription.attach(feed: feed)
-                try publisher.publish(events: [TimeAndSale(attachedSymbol).also(block: { tns in
-                    tns.askPrice = 200
-                })])
-                wait(for: [expectation2], timeout: 1)
-                let symbols = try subcription.getSymbols().map { symbol in
-                    symbol.stringValue
-                }
-                XCTAssert(Set(symbols) == Set([attachedSymbol, detachedSymbol]))
-            } else {
-                XCTAssert(false, "Subscription returned null")
+            try publisher.publish(events: [TimeAndSale(attachedSymbol).also(block: { tns in
+                tns.askPrice = 100
+            })])
+            wait(for: [expectation1], timeout: 1)
+            try subcription.detach(feed: feed)
+            try publisher.publish(events: [TimeAndSale(detachedSymbol)])
+            try subcription.attach(feed: feed)
+            try publisher.publish(events: [TimeAndSale(attachedSymbol).also(block: { tns in
+                tns.askPrice = 200
+            })])
+            wait(for: [expectation2], timeout: 1)
+            let symbols = try subcription.getSymbols().map { symbol in
+                symbol.stringValue
             }
+            XCTAssert(Set(symbols) == Set([attachedSymbol, detachedSymbol]))
         } catch {
             XCTAssert(false, "Error during attach/detach \(error)")
         }
diff --git a/DXFeedFrameworkTests/DXConnectionTest.swift b/DXFeedFrameworkTests/DXConnectionTest.swift
index 9129863a6..d50a5103f 100644
--- a/DXFeedFrameworkTests/DXConnectionTest.swift
+++ b/DXFeedFrameworkTests/DXConnectionTest.swift
@@ -35,7 +35,7 @@ extension DXConnectionListener: Hashable {
 }
 
 final class DXConnectionTest: XCTestCase {
-    override class func setUp() {
+    override func setUpWithError() throws {
         // The experimental property must be enabled.
         try? SystemProperty.setProperty("dxfeed.experimental.dxlink.enable", "true")
         // Set scheme for dxLink.
diff --git a/DXFeedFrameworkTests/DXLastEventTest.swift b/DXFeedFrameworkTests/DXLastEventTest.swift
index 4770a3dc2..7e9b34413 100644
--- a/DXFeedFrameworkTests/DXLastEventTest.swift
+++ b/DXFeedFrameworkTests/DXLastEventTest.swift
@@ -152,111 +152,4 @@ final class DXLastEventTest: XCTestCase {
         }
     }
 
-    func testGetLastEventIfSubscribed() throws {
-        let testSymbol = StringUtil.random(length: 5)
-        let endpoint: DXEndpoint? = try DXEndpoint.create(.localHub)
-        let feed = endpoint?.getFeed()
-        let publisher = endpoint?.getPublisher()
-        let quote = try feed?.getLastEventIfSubscribed(type: Quote.self, symbol: testSymbol)
-        XCTAssertNil(quote)
-        let subscription = try feed?.createSubscription([Quote.self])
-        try subscription?.addSymbols(testSymbol)
-        try publisher?.publish(events: [Quote(testSymbol).also(block: { quote in
-            quote.askPrice = 101
-        })])
-        let existingQuotes = try feed?.getLastEventIfSubscribed(type: Quote.self, symbol: testSymbol)
-        XCTAssertNotNil(existingQuotes)
-        XCTAssertEqual(101, (existingQuotes as? Quote)?.askPrice)
-    }
-
-    func testGetIndexedEventsIfSubscribed() throws {
-        let testSymbol = StringUtil.random(length: 5)
-        let type = Order.self
-        let endpoint: DXEndpoint? = try DXEndpoint.create(.localHub)
-        let feed = endpoint?.getFeed()
-        let publisher = endpoint?.getPublisher()
-        let nillOrderList = try feed?.getIndexedEventsIfSubscribed(type: type,
-                                                                   symbol: testSymbol,
-                                                                   source: .defaultSource)
-        XCTAssertNil(nillOrderList)
-        let subscription = try feed?.createSubscription([type])
-        try subscription?.addSymbols(testSymbol)
-        let emptyOrderList = try feed?.getIndexedEventsIfSubscribed(type: type,
-                                                                    symbol: testSymbol,
-                                                                    source: .defaultSource)
-        XCTAssertNil(emptyOrderList)
-
-        try publisher?.publish(events: [Order(testSymbol).also(block: { order in
-            try? order.setIndex(1)
-            order.orderSide = .buy
-            order.price = 10.5
-            order.size = 100
-        })])
-        let orderList = try feed?.getIndexedEventsIfSubscribed(type: type, symbol: testSymbol, source: .defaultSource)
-        XCTAssertEqual(1, orderList?.count)
-        let order = orderList?.first as? Order
-        XCTAssertNotNil(order)
-        XCTAssertEqual(1, order?.index)
-        XCTAssertEqual(Side.buy, order?.orderSide)
-        XCTAssertEqual(10.5, order?.price)
-        XCTAssertEqual(100, order?.size)
-    }
-
-    func testGetTimeSeriesIfSubscribed() throws {
-        let candleSymbol = CandleSymbol.valueOf( StringUtil.random(length: 5), [CandlePeriod.day])
-        guard let fromTime: Long = try DXTimeFormat.defaultTimeFormat?.parse("20150101"),
-              let toTime: Long = try DXTimeFormat.defaultTimeFormat?.parse("20150710") else {
-            XCTAssert(false, "Parsing failed")
-            return
-        }
-        let type = Candle.self
-        let endpoint: DXEndpoint? = try DXEndpoint.create(.localHub)
-        let feed = endpoint?.getFeed()
-        let publisher = endpoint?.getPublisher()
-        let subscription = try feed?.createSubscription([type])
-
-        do {
-            let nillList = try feed?.getTimeSeriesIfSubscribed(type: type,
-                                                               symbol: candleSymbol,
-                                                               fromTime: fromTime,
-                                                               toTime: toTime)
-            XCTAssertNil(nillList)
-        }
-        do {
-            // wrong sub time
-            try subscription?.addSymbols(TimeSeriesSubscriptionSymbol(symbol: candleSymbol, fromTime: toTime))
-            let nillList = try feed?.getTimeSeriesIfSubscribed(type: type,
-                                                               symbol: candleSymbol,
-                                                               fromTime: fromTime,
-                                                               toTime: toTime)
-            XCTAssertNil(nillList)
-        }
-        do {
-            // right sub time
-            try subscription?.addSymbols(TimeSeriesSubscriptionSymbol(symbol: candleSymbol, fromTime: fromTime))
-            let nillList = try feed?.getTimeSeriesIfSubscribed(type: type,
-                                                               symbol: candleSymbol,
-                                                               fromTime: fromTime,
-                                                               toTime: toTime)
-            XCTAssertNil(nillList)
-        }
-        do {
-            // publish something
-            try publisher?.publish(events: [Candle(candleSymbol).also(block: { candle in
-                candle.time = fromTime
-                candle.close = 10.5
-                candle.volume = 100
-            })])
-            let list = try feed?.getTimeSeriesIfSubscribed(type: type,
-                                                           symbol: candleSymbol,
-                                                           fromTime: fromTime,
-                                                           toTime: toTime)
-            XCTAssertEqual(1, list?.count)
-            let candle = list?.first as? Candle
-            XCTAssertNotNil(candle)
-            XCTAssertEqual(fromTime, candle?.time)
-            XCTAssertEqual(10.5, candle?.close)
-            XCTAssertEqual(100, candle?.volume)
-        }
-    }
 }
diff --git a/DXFeedFrameworkTests/DXLastEventsSubscribedTest.swift b/DXFeedFrameworkTests/DXLastEventsSubscribedTest.swift
new file mode 100644
index 000000000..f3a7559e7
--- /dev/null
+++ b/DXFeedFrameworkTests/DXLastEventsSubscribedTest.swift
@@ -0,0 +1,126 @@
+//
+//
+//  Copyright (C) 2024 Devexperts LLC. All rights reserved.
+//  This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+//  If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
+//  
+
+import XCTest
+@testable import DXFeedFramework
+
+final class DXLastEventsSubscribedTest: XCTestCase {
+    var endpoint: DXEndpoint?
+    var feed: DXFeed?
+    var publisher: DXPublisher?
+
+    override func setUpWithError() throws {
+        endpoint = try DXEndpoint.create(.localHub)
+        feed = endpoint?.getFeed()
+        publisher = endpoint?.getPublisher()
+    }
+
+    override func tearDownWithError() throws {
+        try endpoint?.closeAndAwaitTermination()
+    }
+
+    func testGetLastEventIfSubscribed() throws {
+        let testSymbol = StringUtil.random(length: 5)
+
+        let quote = try feed?.getLastEventIfSubscribed(type: Quote.self, symbol: testSymbol)
+        XCTAssertNil(quote)
+        let subscription = try feed?.createSubscription([Quote.self])
+        try subscription?.addSymbols(testSymbol)
+        try publisher?.publish(events: [Quote(testSymbol).also(block: { quote in
+            quote.askPrice = 101
+        })])
+        let existingQuotes = try feed?.getLastEventIfSubscribed(type: Quote.self, symbol: testSymbol)
+        XCTAssertNotNil(existingQuotes)
+        XCTAssertEqual(101, (existingQuotes as? Quote)?.askPrice)
+    }
+
+    func testGetIndexedEventsIfSubscribed() throws {
+        let testSymbol = StringUtil.random(length: 5)
+        let type = Order.self
+        let nillOrderList = try feed?.getIndexedEventsIfSubscribed(type: type,
+                                                                   symbol: testSymbol,
+                                                                   source: .defaultSource)
+        XCTAssertNil(nillOrderList)
+        let subscription = try feed?.createSubscription([type])
+        try subscription?.addSymbols(testSymbol)
+        let emptyOrderList = try feed?.getIndexedEventsIfSubscribed(type: type,
+                                                                    symbol: testSymbol,
+                                                                    source: .defaultSource)
+        XCTAssertNil(emptyOrderList)
+
+        try publisher?.publish(events: [Order(testSymbol).also(block: { order in
+            try? order.setIndex(1)
+            order.orderSide = .buy
+            order.price = 10.5
+            order.size = 100
+        })])
+        let orderList = try feed?.getIndexedEventsIfSubscribed(type: type, symbol: testSymbol, source: .defaultSource)
+        XCTAssertEqual(1, orderList?.count)
+        let order = orderList?.first as? Order
+        XCTAssertNotNil(order)
+        XCTAssertEqual(1, order?.index)
+        XCTAssertEqual(Side.buy, order?.orderSide)
+        XCTAssertEqual(10.5, order?.price)
+        XCTAssertEqual(100, order?.size)
+    }
+
+    func testGetTimeSeriesIfSubscribed() throws {
+        let candleSymbol = CandleSymbol.valueOf( StringUtil.random(length: 5), [CandlePeriod.day])
+        guard let fromTime: Long = try DXTimeFormat.defaultTimeFormat?.parse("20150101"),
+              let toTime: Long = try DXTimeFormat.defaultTimeFormat?.parse("20150710") else {
+            XCTAssert(false, "Parsing failed")
+            return
+        }
+        let type = Candle.self
+        let subscription = try feed?.createSubscription([type])
+
+        do {
+            let nillList = try feed?.getTimeSeriesIfSubscribed(type: type,
+                                                               symbol: candleSymbol,
+                                                               fromTime: fromTime,
+                                                               toTime: toTime)
+            XCTAssertNil(nillList)
+        }
+        do {
+            // wrong sub time
+            try subscription?.addSymbols(TimeSeriesSubscriptionSymbol(symbol: candleSymbol, fromTime: toTime))
+            let nillList = try feed?.getTimeSeriesIfSubscribed(type: type,
+                                                               symbol: candleSymbol,
+                                                               fromTime: fromTime,
+                                                               toTime: toTime)
+            XCTAssertNil(nillList)
+        }
+        do {
+            // right sub time
+            try subscription?.addSymbols(TimeSeriesSubscriptionSymbol(symbol: candleSymbol, fromTime: fromTime))
+            let nillList = try feed?.getTimeSeriesIfSubscribed(type: type,
+                                                               symbol: candleSymbol,
+                                                               fromTime: fromTime,
+                                                               toTime: toTime)
+            XCTAssertNil(nillList)
+        }
+        do {
+            // publish something
+            try publisher?.publish(events: [Candle(candleSymbol).also(block: { candle in
+                candle.time = fromTime
+                candle.close = 10.5
+                candle.volume = 100
+            })])
+            let list = try feed?.getTimeSeriesIfSubscribed(type: type,
+                                                           symbol: candleSymbol,
+                                                           fromTime: fromTime,
+                                                           toTime: toTime)
+            XCTAssertEqual(1, list?.count)
+            let candle = list?.first as? Candle
+            XCTAssertNotNil(candle)
+            XCTAssertEqual(fromTime, candle?.time)
+            XCTAssertEqual(10.5, candle?.close)
+            XCTAssertEqual(100, candle?.volume)
+        }
+    }
+
+}
diff --git a/DXFeedFrameworkTests/DXOtcMarketOrderTest.swift b/DXFeedFrameworkTests/DXOtcMarketOrderTest.swift
index 5ff422eb1..2099f2a4d 100644
--- a/DXFeedFrameworkTests/DXOtcMarketOrderTest.swift
+++ b/DXFeedFrameworkTests/DXOtcMarketOrderTest.swift
@@ -71,7 +71,7 @@ final class DXOtcMarketOrderTest: XCTestCase {
                 if events.count > 0 {
                     events.forEach { event in
                         XCTAssertEqual(event.type, .otcMarketsOrder)
-                        var event = event.otcMarketsOrder
+                        let event = event.otcMarketsOrder
                         if event.eventSymbol == SYMBOL1 {
                             XCTAssertEqual(event.marketMaker, "MM1")
                             XCTAssertEqual(event.price, 10)
diff --git a/DXFeedFrameworkTests/DXPromiseTest.swift b/DXFeedFrameworkTests/DXPromiseTest.swift
index 5b0703848..1801c0db9 100644
--- a/DXFeedFrameworkTests/DXPromiseTest.swift
+++ b/DXFeedFrameworkTests/DXPromiseTest.swift
@@ -186,7 +186,8 @@ final class DXPromiseTest: XCTestCase {
     func testGetMultipleResultsWithException() {
         do {
 
-            let promises = try feed?.getLastEventsPromises(type: Quote.self, symbols: ["ETH/USD:GDAX_TEST", "AAPL_TEST"])
+            let promises = try feed?.getLastEventsPromises(type: Quote.self,
+                                                           symbols: ["ETH/USD:GDAX_TEST", "AAPL_TEST"])
             if promises?.isEmpty != false {
                 XCTAssert(false, "Promises is empty")
             }
diff --git a/Samples/QuoteTableApp/QuoteTableViewController.swift b/Samples/QuoteTableApp/QuoteTableViewController.swift
index a3825f359..3881b4fd3 100644
--- a/Samples/QuoteTableApp/QuoteTableViewController.swift
+++ b/Samples/QuoteTableApp/QuoteTableViewController.swift
@@ -29,7 +29,9 @@ class QuoteTableViewController: UIViewController {
 
         quoteTableView.separatorStyle = .none
 
-        NotificationCenter.default.addObserver(forName: .selectedSymbolsChanged, object: nil, queue: nil) { [weak self] (_) in
+        NotificationCenter.default.addObserver(forName: .selectedSymbolsChanged,
+                                               object: nil,
+                                               queue: nil) { [weak self] (_) in
             guard let strongSelf = self else {
                 return
             }