diff --git a/Account/Tests/AccountTests/Feedly/FeedlyOperationTests.swift b/Account/Tests/AccountTests/Feedly/FeedlyOperationTests.swift
deleted file mode 100644
index 9c34d0c61..000000000
--- a/Account/Tests/AccountTests/Feedly/FeedlyOperationTests.swift
+++ /dev/null
@@ -1,230 +0,0 @@
-//
-//  FeedlyOperationTests.swift
-//  AccountTests
-//
-//  Created by Kiel Gillard on 21/10/19.
-//  Copyright © 2019 Ranchero Software, LLC. All rights reserved.
-//
-
-import XCTest
-@testable import Account
-import Web
-
-class FeedlyOperationTests: XCTestCase {
-	
-	enum TestOperationError: Error, Equatable {
-		case mockError
-		case anotherMockError
-	}
-	
-	final class TestOperation: FeedlyOperation {
-		var didCallMainExpectation: XCTestExpectation?
-		var mockError: Error?
-		
-		override func run() {
-			super.run()
-			// Should always call on main thread.
-			XCTAssertTrue(Thread.isMainThread)
-			
-			didCallMainExpectation?.fulfill()
-			
-			if let error = mockError {
-				didFinish(with: error)
-			} else {
-				didFinish()
-			}
-		}
-	}
-	
-	final class TestDelegate: FeedlyOperationDelegate {
-		
-		var error: Error?
-		var didFailExpectation: XCTestExpectation?
-		
-		func feedlyOperation(_ operation: FeedlyOperation, didFailWith error: Error) {
-			didFailExpectation?.fulfill()
-			self.error = error
-		}
-	}
-
-    func testDoesCallMain() {
-        let testOperation = TestOperation()
-		testOperation.didCallMainExpectation = expectation(description: "Did Call Main")
-		
-		MainThreadOperationQueue.shared.add(testOperation)
-		
-		waitForExpectations(timeout: 2)
-    }
-
-	func testDoesFail() {
-        let testOperation = TestOperation()
-		testOperation.didCallMainExpectation = expectation(description: "Did Call Main")
-		testOperation.mockError = TestOperationError.mockError
-		
-		let delegate = TestDelegate()
-		delegate.didFailExpectation = expectation(description: "Operation Failed As Expected")
-		
-		testOperation.delegate = delegate
-		
-		MainThreadOperationQueue.shared.add(testOperation)
-		
-		waitForExpectations(timeout: 2)
-		
-		if let error = delegate.error as? TestOperationError {
-			XCTAssertEqual(error, TestOperationError.mockError)
-		} else {
-			XCTFail("Expected \(TestOperationError.self) but got \(String(describing: delegate.error)).")
-		}
-    }
-	
-	func testOperationFlags() {
-        let testOperation = TestOperation()
-		testOperation.didCallMainExpectation = expectation(description: "Did Call Main")
-		
-		let completionExpectation = expectation(description: "Operation Completed")
-		testOperation.completionBlock = { _ in
-			completionExpectation.fulfill()
-		}
-		
-
-		XCTAssertFalse(testOperation.isCanceled)
-		
-		MainThreadOperationQueue.shared.add(testOperation)
-		
-		waitForExpectations(timeout: 2)
-		
-		XCTAssertFalse(testOperation.isCanceled)
-    }
-	
-	func testOperationCancellationFlags() {
-        let testOperation = TestOperation()
-		testOperation.didCallMainExpectation = expectation(description: "Did Call Main")
-		testOperation.didCallMainExpectation?.isInverted = true
-		
-		let completionExpectation = expectation(description: "Operation Completed")
-		testOperation.completionBlock = { _ in
-			completionExpectation.fulfill()
-		}
-		
-		XCTAssertFalse(testOperation.isCanceled)
-		
-		MainThreadOperationQueue.shared.add(testOperation)
-		
-		MainThreadOperationQueue.shared.cancelOperations([testOperation])
-		
-		waitForExpectations(timeout: 2)
-		
-		XCTAssertTrue(testOperation.isCanceled)
-    }
-	
-	func testDependency() {
-//        let testOperation = TestOperation()
-//		testOperation.didCallMainExpectation = expectation(description: "Did Call Main")
-//		
-//		let dependencyExpectation = expectation(description: "Did Call Dependency")
-//		let blockOperation = BlockOperation {
-//			dependencyExpectation.fulfill()
-//		}
-//
-//		MainThreadOperationQueue.shared.make(blockOperation, dependOn: testOperation)
-//
-//		//XCTAssertTrue(blockOperation.dependencies.contains(testOperation))
-//		
-//		MainThreadOperationQueue.shared.addOperations([testOperation, blockOperation])
-//		
-//		waitForExpectations(timeout: 2)
-    }
-	
-	func testProgressReporting() {
-		let progress = DownloadProgress(numberOfTasks: 0)
-		let didChangeExpectation = expectation(forNotification: .DownloadProgressDidChange, object: progress)
-		// This number is the number of times breakpoints on calls to DownloadProgress.postDidChangeNotification is hit.
-		didChangeExpectation.expectedFulfillmentCount = 4
-		didChangeExpectation.assertForOverFulfill = true
-		
-        let testOperation = TestOperation()
-		
-		testOperation.downloadProgress = progress
-		XCTAssertTrue(progress.numberRemaining == 1)
-		
-		testOperation.downloadProgress = nil
-		XCTAssertTrue(progress.numberRemaining == 0)
-		
-		waitForExpectations(timeout: 2)
-	}
-	
-	func testProgressReportingOnCancel() {
-		let progress = DownloadProgress(numberOfTasks: 0)
-		let didChangeExpectation = expectation(forNotification: .DownloadProgressDidChange, object: progress)
-		// This number is the number of times breakpoints on calls to DownloadProgress.postDidChangeNotification is hit.
-		didChangeExpectation.expectedFulfillmentCount = 4
-		didChangeExpectation.assertForOverFulfill = true
-		
-		let testOperation = TestOperation()
-		testOperation.downloadProgress = progress
-		
-		let completionExpectation = expectation(description: "Operation Completed")
-		testOperation.completionBlock = { _ in
-			completionExpectation.fulfill()
-		}
-		
-		MainThreadOperationQueue.shared.add(testOperation)
-		
-		XCTAssertTrue(progress.numberRemaining == 1)
-		MainThreadOperationQueue.shared.cancelOperations([testOperation])
-		XCTAssertTrue(progress.numberRemaining == 0)
-		
-		waitForExpectations(timeout: 2)
-		
-		XCTAssertTrue(progress.numberRemaining == 0)
-    }
-	
-	func testDoesProgressReportingOnSuccess() {
-		let progress = DownloadProgress(numberOfTasks: 0)
-		let didChangeExpectation = expectation(forNotification: .DownloadProgressDidChange, object: progress)
-		// This number is the number of times breakpoints on calls to DownloadProgress.postDidChangeNotification is hit.
-		didChangeExpectation.expectedFulfillmentCount = 4
-		didChangeExpectation.assertForOverFulfill = true
-		
-		let testOperation = TestOperation()
-		testOperation.downloadProgress = progress
-		
-		let completionExpectation = expectation(description: "Operation Completed")
-		testOperation.completionBlock = { _ in
-			completionExpectation.fulfill()
-		}
-		
-		MainThreadOperationQueue.shared.add(testOperation)
-		
-		XCTAssertTrue(progress.numberRemaining == 1)
-		
-		waitForExpectations(timeout: 2)
-		
-		XCTAssertTrue(progress.numberRemaining == 0)
-    }
-	
-	func testProgressReportingOnFailure() {
-		let progress = DownloadProgress(numberOfTasks: 0)
-		let didChangeExpectation = expectation(forNotification: .DownloadProgressDidChange, object: progress)
-		// This number is the number of times breakpoints on calls to DownloadProgress.postDidChangeNotification is hit.
-		didChangeExpectation.expectedFulfillmentCount = 4
-		didChangeExpectation.assertForOverFulfill = true
-		
-		let testOperation = TestOperation()
-		testOperation.mockError = TestOperationError.mockError
-		testOperation.downloadProgress = progress
-		
-		let completionExpectation = expectation(description: "Operation Completed")
-		testOperation.completionBlock = { _ in
-			completionExpectation.fulfill()
-		}
-		
-		MainThreadOperationQueue.shared.add(testOperation)
-		
-		XCTAssertTrue(progress.numberRemaining == 1)
-		
-		waitForExpectations(timeout: 2)
-		
-		XCTAssertTrue(progress.numberRemaining == 0)
-    }
-}