 class PersonalityInsightsTests: XCTestCase {
 
     private var personalityInsights: PersonalityInsights!
-    private var mobyDickIntro: String?
-    private var kennedySpeechTXT: String?
-    private var kennedySpeechHTML: String?
-    private var version: String = "2016-10-20"
+    private var text: String!
+    private var html: String!
+    private var short: String!
 
     static var allTests: [(String, (PersonalityInsightsTests) -> () throws -> Void)] {
         return [
-            ("testProfile", testProfile),
-            ("testContentItem", testContentItem),
-            ("testHTMLProfile", testHTMLProfile),
+            ("testProfileText", testProfileText),
+            ("testProfileHTML", testProfileHTML),
+            ("testProfileContent", testProfileContent),
             ("testNeedsAndConsumptionPreferences", testNeedsAndConsumptionPreferences),
             ("testProfileWithShortText", testProfileWithShortText),
         ]

        waitForExpectations()
    }

    /** Analyze needs and consumption preferences. */
    func testNeedsAndConsumptionPreferences() {
        let description = "Analyze needs and consumption preferences."
        let expectation = self.expectation(description: description)

        guard let kennedySpeech = kennedySpeechTXT else {
            XCTFail("Unable to read KennedySpeech.txt file.")
            return
        }

        personalityInsights.getProfile(fromText: kennedySpeech,
                                       rawScores: true,
                                       consumptionPreferences: true,
                                       failure: failWithError)
        {
            profile in
            for need in profile.needs {
                XCTAssertNotNil(need.rawScore)


    // MARK: - Negative Tests

    func testProfileWithShortText() {
        let expectation = self.expectation(description: "profile(text:)")
        let failure = { (error: Error) in expectation.fulfill() }
        personalityInsights.profile(text: short, failure: failure, success: failWithResult)
        waitForExpectations()
    }
}
