                     XCTAssertEqual(manager.session, session, "Manager should persist session")
                     let fetchOptions = self.basicFetchOptions
                     let fetcher = manager.fetcher(withOptions: fetchOptions)
-                    XCTAssertEqual(fetchOptions.filterOptions.fetchOptions, fetchOptions, "Fetch options should be persisted in filter options")
-                    XCTAssertEqual(fetchOptions.sortOptions.fetchOptions, fetchOptions, "Fetch options should be persisted in filter options")
                     XCTAssertEqual(fetcher.fetchOptions, fetchOptions, "Fetch options should be persisted in fetcher")
                     
                     session.close()

                    XCTAssertEqual(manager.session, session, "Manager should persist session")
                    let fetchOptions = self.basicFetchOptions
                    let fetcher = manager.fetcher(withOptions: fetchOptions)
                    XCTAssertEqual(fetchOptions.filterOptions.fetchOptions, fetchOptions, "Fetch options should be persisted in filter options")
                    XCTAssertEqual(fetchOptions.sortOptions.fetchOptions, fetchOptions, "Fetch options should be persisted in filter options")
                    XCTAssertEqual(fetcher.fetchOptions, fetchOptions, "Fetch options should be persisted in fetcher")
                    
                    session.close()

        XCTAssertTrue(sortOptions.lastEventDate, "Default sort options should include lastEventDate")
        XCTAssertFalse(sortOptions.favoriteTag, "Default sort options should not include favoriteTag")
        XCTAssertTrue(sortOptions.suggested, "Default sort options should include suggested")
    }
    
    func testFetchOptionsInit() {
