         let indexPath = IndexPath(item: 0, section: 0)
         testGallery.imageCollectionView.reloadItems(at: [indexPath])
 
-        expect(self.testHelper.timesAskedForImageInGallery[0]).to(beGreaterThan(0))
-        expect(self.testHelper.timesAskedForImageInGallery[1]).to(beGreaterThan(0))
+        XCTAssert(self.testHelper.timesAskedForImageInGallery[0]! > 0)
+        XCTAssert(self.testHelper.timesAskedForImageInGallery[1]! > 0)
     }
 
     func testSetDataSourceReloadsImages() {
         let newDataSource = SwiftPhotoGalleryTestHelper()
 
-        expect(newDataSource.timesAskedForNumberOfImagesInGallery).to(equal(0))
+        XCTAssert(newDataSource.timesAskedForNumberOfImagesInGallery == 0)
 
         testGallery.dataSource = newDataSource
 

    func testProgramaticInitialization() {
        testGallery.viewDidLoad()
        testGallery.isRevolvingCarouselEnabled = false
        
        expect(self.testGallery.delegate).toNot(beNil())
        expect(self.testGallery.delegate) === testHelper

        expect(self.testGallery.dataSource).toNot(beNil())
        expect(self.testGallery.dataSource) === testHelper

        expect(self.testGallery.currentPage).to(equal(0))
    }

    func testNumberOfImagesDataSourceCalled() {
        testGallery.viewDidLoad()

        expect(self.testGallery.numberOfImages).to(equal(3))
        expect(self.testHelper.timesAskedForNumberOfImagesInGallery).to(beGreaterThan(0))
    }

    func testFirstImagesLoadedAfterInitialization() {


        testGallery.currentPage = 3

        XCTAssert(helperCollectionView.didScroll == true)
    }

    func testReloadWithoutParameters() {
