     }
 
     private func configuredArticleListWithFeeds(feeds: [Feed]) -> ArticleListController {
-        self.articleListController.feeds = feeds
-        return self.articleListController
+        let articleListController = self.articleListController()
+        articleListController.feeds = feeds
+        return articleListController
     }
 
     private func showArticleList(articleListController: ArticleListController, animated: Bool) {

    private let themeRepository: ThemeRepository
    private let settingsRepository: SettingsRepository

    private let findFeedViewController: FindFeedViewController
    private let localImportViewController: LocalImportViewController
    private let feedViewController: FeedViewController
    private let queryFeedViewController: QueryFeedViewController
    private let settingsViewController: SettingsViewController
    private let articleListController: ArticleListController

    // swiftlint:disable function_parameter_count
    public init(feedRepository: FeedRepository,
                themeRepository: ThemeRepository,
                settingsRepository: SettingsRepository,
                findFeedViewController: FindFeedViewController,
                localImportViewController: LocalImportViewController,
                feedViewController: FeedViewController,
                queryFeedViewController: QueryFeedViewController,
                settingsViewController: SettingsViewController,
                articleListController: ArticleListController
        ) {
        self.feedRepository = feedRepository
        self.themeRepository = themeRepository


    // MARK - Private/Internal

    internal func importFromWeb() { self.presentController(self.findFeedViewController()) }

    @objc private func importFromLocal() { self.presentController(self.localImportViewController()) }

    @objc private func createQueryFeed() { self.presentController(self.queryFeedViewController()) }

    @objc private func search() { self.searchBar.becomeFirstResponder() }

    @objc private func presentSettings() { self.presentController(self.settingsViewController()) }

    private func presentController(viewController: UIViewController) {
        let nc = UINavigationController(rootViewController: viewController)
