diff --git a/Frameworks/Account/AccountTests/Feedly/FeedlySetStarredArticlesOperationTests.swift b/Frameworks/Account/AccountTests/Feedly/FeedlySetStarredArticlesOperationTests.swift
index e86ba2de3..28e376cda 100644
--- a/Frameworks/Account/AccountTests/Feedly/FeedlySetStarredArticlesOperationTests.swift
+++ b/Frameworks/Account/AccountTests/Feedly/FeedlySetStarredArticlesOperationTests.swift
@@ -49,10 +49,15 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
 		waitForExpectations(timeout: 2)
 		
 		let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
-		account.fetchStarredArticleIDs { accountArticlesIDs in
-			XCTAssertTrue(accountArticlesIDs.isEmpty)
-			XCTAssertEqual(accountArticlesIDs, testIds)
-			fetchIdsExpectation.fulfill()
+		account.fetchStarredArticleIDs { accountArticlesIDsResult in
+			do {
+				let accountArticlesIDs = try accountArticlesIDsResult.get()
+				XCTAssertTrue(accountArticlesIDs.isEmpty)
+				XCTAssertEqual(accountArticlesIDs, testIds)
+				fetchIdsExpectation.fulfill()
+			} catch let e {
+				XCTFail("Error checking articles IDs: \(e)")
+			}
 		}
 		waitForExpectations(timeout: 2)
 	}
@@ -73,9 +78,14 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
 		waitForExpectations(timeout: 2)
 		
 		let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
-		account.fetchStarredArticleIDs { accountArticlesIDs in
-			XCTAssertEqual(accountArticlesIDs.count, testIds.count)
-			fetchIdsExpectation.fulfill()
+		account.fetchStarredArticleIDs { accountArticlesIDsResult in
+			do {
+				let accountArticlesIDs = try accountArticlesIDsResult.get()
+				XCTAssertEqual(accountArticlesIDs.count, testIds.count)
+				fetchIdsExpectation.fulfill()
+			} catch let e {
+				XCTFail("Error checking articles IDs: \(e)")
+			}
 		}
 		waitForExpectations(timeout: 2)
 	}
@@ -96,9 +106,14 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
 		waitForExpectations(timeout: 2)
 		
 		let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
-		account.fetchStarredArticleIDs { accountArticlesIDs in
-			XCTAssertEqual(accountArticlesIDs.count, testIds.count)
-			fetchIdsExpectation.fulfill()
+		account.fetchStarredArticleIDs { accountArticlesIDsResult in
+			do {
+				let accountArticlesIDs = try accountArticlesIDsResult.get()
+				XCTAssertEqual(accountArticlesIDs.count, testIds.count)
+				fetchIdsExpectation.fulfill()
+			} catch let e {
+				XCTFail("Error checking articles IDs: \(e)")
+			}
 		}
 		waitForExpectations(timeout: 2)
 	}
@@ -134,9 +149,14 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
 		waitForExpectations(timeout: 2)
 		
 		let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
-		account.fetchStarredArticleIDs { remainingAccountArticlesIDs in
-			XCTAssertEqual(remainingAccountArticlesIDs, remainingStarredIds)
-			fetchIdsExpectation.fulfill()
+		account.fetchStarredArticleIDs { remainingAccountArticlesIDsResult in
+			do {
+				let remainingAccountArticlesIDs = try remainingAccountArticlesIDsResult.get()
+				XCTAssertEqual(remainingAccountArticlesIDs, remainingStarredIds)
+				fetchIdsExpectation.fulfill()
+			} catch let e {
+				XCTFail("Error checking articles IDs: \(e)")
+			}
 		}
 		waitForExpectations(timeout: 2)
 	}
@@ -172,9 +192,14 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
 		waitForExpectations(timeout: 2)
 		
 		let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
-		account.fetchStarredArticleIDs { remainingAccountArticlesIDs in
-			XCTAssertEqual(remainingAccountArticlesIDs, remainingStarredIds)
-			fetchIdsExpectation.fulfill()
+		account.fetchStarredArticleIDs { remainingAccountArticlesIDsResult in
+			do {
+				let remainingAccountArticlesIDs = try remainingAccountArticlesIDsResult.get()
+				XCTAssertEqual(remainingAccountArticlesIDs, remainingStarredIds)
+				fetchIdsExpectation.fulfill()
+			} catch let e {
+				XCTFail("Error checking articles IDs: \(e)")
+			}
 		}
 		waitForExpectations(timeout: 2)
 	}
@@ -221,15 +246,20 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
 		waitForExpectations(timeout: 2)
 		
 		let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
-		account.fetchStarredArticleIDs { accountArticlesIDs in
-			XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
-			
-			let idsOfStarredArticles = Set(self.account
-				.fetchArticles(.articleIDs(remainingStarredIds))
-				.filter { $0.status.boolStatus(forKey: .starred) == true }
-				.map { $0.articleID })
-			
-			XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
+		account.fetchStarredArticleIDs { accountArticlesIDsResult in
+			do {
+				let accountArticlesIDs = try accountArticlesIDsResult.get()
+				XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
+				
+				let idsOfStarredArticles = Set(try self.account
+					.fetchArticles(.articleIDs(remainingStarredIds))
+					.filter { $0.status.boolStatus(forKey: .starred) == true }
+					.map { $0.articleID })
+				
+				XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
+			} catch let e {
+				XCTFail("Error checking articles IDs: \(e)")
+			}
 		}
 		waitForExpectations(timeout: 2)
 	}
@@ -274,15 +304,20 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
 		waitForExpectations(timeout: 2)
 		
 		let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
-		account.fetchStarredArticleIDs { accountArticlesIDs in
-			XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
-			
-			let idsOfStarredArticles = Set(self.account
-				.fetchArticles(.articleIDs(remainingStarredIds))
-				.filter { $0.status.boolStatus(forKey: .starred) == true }
-				.map { $0.articleID })
-			
-			XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
+		account.fetchStarredArticleIDs { accountArticlesIDsResult in
+			do {
+				let accountArticlesIDs = try accountArticlesIDsResult.get()
+				XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
+				
+				let idsOfStarredArticles = Set(try self.account
+					.fetchArticles(.articleIDs(remainingStarredIds))
+					.filter { $0.status.boolStatus(forKey: .starred) == true }
+					.map { $0.articleID })
+				
+				XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
+			} catch let e {
+				XCTFail("Error checking articles IDs: \(e)")
+			}
 		}
 		waitForExpectations(timeout: 2)
 	}
@@ -321,16 +356,21 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
 		waitForExpectations(timeout: 2)
 		
 		let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
-		account.fetchStarredArticleIDs { accountArticlesIDs in
-			XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
-			
-			let idsOfStarredArticles = Set(self.account
-				.fetchArticles(.articleIDs(remainingStarredIds))
-				.filter { $0.status.boolStatus(forKey: .starred) == true }
-				.map { $0.articleID })
-			
-			XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
-			fetchIdsExpectation.fulfill()
+		account.fetchStarredArticleIDs { accountArticlesIDsResult in
+			do {
+				let accountArticlesIDs = try accountArticlesIDsResult.get()
+				XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
+				
+				let idsOfStarredArticles = Set(try self.account
+					.fetchArticles(.articleIDs(remainingStarredIds))
+					.filter { $0.status.boolStatus(forKey: .starred) == true }
+					.map { $0.articleID })
+				
+				XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
+				fetchIdsExpectation.fulfill()
+			} catch let e {
+				XCTFail("Error checking articles IDs: \(e)")
+			}
 		}
 		waitForExpectations(timeout: 2)
 	}
@@ -368,16 +408,21 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
 		waitForExpectations(timeout: 2)
 		
 		let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
-		account.fetchStarredArticleIDs { accountArticlesIDs in
-			XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
-			
-			let idsOfStarredArticles = Set(self.account
-				.fetchArticles(.articleIDs(remainingStarredIds))
-				.filter { $0.status.boolStatus(forKey: .starred) == true }
-				.map { $0.articleID })
-			
-			XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
-			fetchIdsExpectation.fulfill()
+		account.fetchStarredArticleIDs { accountArticlesIDsResult in
+			do {
+				let accountArticlesIDs = try accountArticlesIDsResult.get()
+				XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
+				
+				let idsOfStarredArticles = Set(try self.account
+					.fetchArticles(.articleIDs(remainingStarredIds))
+					.filter { $0.status.boolStatus(forKey: .starred) == true }
+					.map { $0.articleID })
+				
+				XCTAssertEqual(idsOfStarredArticles, remainingStarredIds)
+				fetchIdsExpectation.fulfill()
+			} catch let e {
+				XCTFail("Error checking articles IDs: \(e)")
+			}
 		}
 		waitForExpectations(timeout: 2)
 	}
@@ -418,19 +463,24 @@ class FeedlySetStarredArticlesOperationTests: XCTestCase {
 		waitForExpectations(timeout: 2)
 		
 		let fetchIdsExpectation = expectation(description: "Fetch Article Ids")
-		account.fetchStarredArticleIDs { accountArticlesIDs in
-			XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
-			
-			let someTestItems = Set(someItemsAndFeeds.flatMap { $0.value })
-			let someRemainingStarredIdsOfIngestedArticles = Set(someTestItems.compactMap { $0.syncServiceID })
-			let idsOfStarredArticles = Set(self.account
-				.fetchArticles(.articleIDs(someRemainingStarredIdsOfIngestedArticles))
-				.filter { $0.status.boolStatus(forKey: .starred) == true }
-				.map { $0.articleID })
-			
-			XCTAssertEqual(idsOfStarredArticles, someRemainingStarredIdsOfIngestedArticles)
-			
-			fetchIdsExpectation.fulfill()
+		account.fetchStarredArticleIDs { accountArticlesIDsResult in
+			do {
+				let accountArticlesIDs = try accountArticlesIDsResult.get()
+				XCTAssertEqual(accountArticlesIDs, remainingStarredIds)
+				
+				let someTestItems = Set(someItemsAndFeeds.flatMap { $0.value })
+				let someRemainingStarredIdsOfIngestedArticles = Set(someTestItems.compactMap { $0.syncServiceID })
+				let idsOfStarredArticles = Set(try self.account
+					.fetchArticles(.articleIDs(someRemainingStarredIdsOfIngestedArticles))
+					.filter { $0.status.boolStatus(forKey: .starred) == true }
+					.map { $0.articleID })
+				
+				XCTAssertEqual(idsOfStarredArticles, someRemainingStarredIdsOfIngestedArticles)
+				
+				fetchIdsExpectation.fulfill()
+			} catch let e {
+				XCTFail("Error checking articles IDs: \(e)")
+			}
 		}
 		waitForExpectations(timeout: 2)
 	}