             controller.connect()
         })
         discovery.startDiscovery()
-        waitForExpectationsWithTimeout(10.0, handler: {_ in discovery.stopDiscovery() })
+        waitForExpectationsWithTimeout(10.0) {_ in discovery.stopDiscovery() }
     }
 
-    func testNuimoControllerDisplayLEDMatrix() {
+    func testNuimoControllerDisplaysLEDMatrix() {
         let expectation = expectationWithDescription("Nuimo controller should display LED matrix")
         let discovery = NuimoDiscoveryManager()
         discovery.delegate = NuimoDiscoveryDelegateClosures(onDiscoverController: { controller in

            controller.connect()
        })
        discovery.startDiscovery()
        waitForExpectationsWithTimeout(20.0, handler: {_ in discovery.stopDiscovery() })

        XCTAssert(framesDisplayed >= expectedMinDisplayedFrameCount, "Nuimo controller should display at least \(expectedMinDisplayedFrameCount) animation frames but it displayed only \(framesDisplayed) frames")
        XCTAssert(framesDisplayed <= expectedMaxDisplayedFrameCount, "Nuimo controller should not display more than \(expectedMaxDisplayedFrameCount) but it displayed \(framesDisplayed)")
    }
}

func after(delay: NSTimeInterval, _ block: dispatch_block_t) {
    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, Int64(delay * Double(NSEC_PER_SEC))), dispatch_get_main_queue(), block)
}


            controller.connect()
        })
        discovery.startDiscovery()
        waitForExpectationsWithTimeout(30.0) {_ in discovery.stopDiscovery() }
    }

    func testNuimoControllerSkipsLEDAnimationFramesIfFramesAreSentTooFast() {
