     func testMessageWithImageIconDurationAndCompletion() {
         let testView = getTestView()
         
-        let asyncExpectation = expectationWithDescription("Completion duration message with image icon, duration and completion")
+        let asyncExpectation = expectation(description: "Completion duration message with image icon, duration and completion")
         APESuperHUD.showOrUpdateHUD(icon: createTestImage(width: 200, height: 200), message: originalText, duration: 3.0, presentingView: testView, completion: { _ in
             asyncExpectation.fulfill()
         })
-        validateShow(testView)
-        validateMessage(testView, informationText: originalText)
-        
-        self.waitForExpectationsWithTimeout(8) { error in
+        validateShow(view: testView)
+        validateMessage(view: testView, informationText: originalText)
+        
+        self.waitForExpectations(timeout: 8) { error in
             XCTAssertNil(error, "A error while removing HUD")
-            if self.hudViewExists(testView) {
+            if self.hudViewExists(view: testView) {
                 XCTFail("HUD view did not get removed.")
             }
         }

        let testView = getTestView()
        
        // Test show and auto remove
        let asyncExpectation = expectationWithDescription("Completion duration message with default icon, duration and completion")
        APESuperHUD.showOrUpdateHUD(icon: .CheckMark, message: originalText, duration: 3.0, presentingView: testView, completion: { _ in
            asyncExpectation.fulfill()
        })
        validateShow(testView)
        validateMessage(testView, informationText: originalText)
        
        self.waitForExpectationsWithTimeout(8) { error in
            XCTAssertNil(error, "A error while removing HUD")
            if self.hudViewExists(testView) {
                XCTFail("HUD view did not get removed.")
            }
        }

    func testAppearance() {
        let animationInTime = 1.2
        let animationOutTime = 1.5
        let backgroundColor = UIColor.black
        let cornerRadius = 12.0
        let foregroundColor = UIColor.black
        let iconColor = UIColor.brown
        let loadingActivityIndicatorColor = UIColor.purple
        
        APESuperHUD.appearance.animateInTime = animationInTime
        APESuperHUD.appearance.animateOutTime = animationOutTime
