         swiftAddressBook?.requestAccessWithCompletion({ (success, error) -> Void in
             XCTAssertTrue(success, self.accessError)
             if success {
-                var person: SwiftAddressBookPerson? = SwiftAddressBookPerson.create()
+                var optionalPerson: SwiftAddressBookPerson? = SwiftAddressBookPerson.create()
                 var timeStamp = self.getDateTimestamp()
-                if let person = person {
+                if let person = optionalPerson {
                     person.firstName = "Test" + timeStamp;
                     swiftAddressBook?.addRecord(person)
                     swiftAddressBook?.save()
                 }
                 
-                person = swiftAddressBook?.allPeople?.filter({ p in p.firstName == "Test" + timeStamp }).first
-                XCTAssertNotNil(person, "Couldn't find newly added person")
-                
-                if person != nil {
-                    if let person = person {
+                optionalPerson = swiftAddressBook?.allPeople?.filter({ p in p.firstName == "Test" + timeStamp }).first
+                XCTAssertNotNil(optionalPerson, "Couldn't find newly added person")
+                
+                if optionalPerson != nil {
+                    if let person = optionalPerson {
                         //TODO: test ALL fields
                         person.firstName = "Darth" + timeStamp
                         person.lastName = "Vader" + timeStamp

                    XCTAssert(person.phoneNumbers != nil, "Phone numbers collection was nil")
                    if let phoneNumbers = person.phoneNumbers {
                        XCTAssert(phoneNumbers.count == 2, "Wrong phone number count")
                        XCTAssert(phoneNumbers[0].label == "mobile", "Incorrect first phone label")
                        XCTAssert(phoneNumbers[0].value == "(555) 564-8583", "Incorrect first phone number")
                        XCTAssert(phoneNumbers[1].label == "main", "Incorrect second phone label")
                        XCTAssert(phoneNumbers[1].value == "(415) 555-3695", "Incorrect second phone number")
                    }
                    XCTAssert(person.phoneNumbers != nil, "Email collection was nil")
                    if let emails = person.emails {
                        XCTAssert(emails.count == 2, "Wrong email count")
                        XCTAssert(emails[0].label == "work", "Incorrect first email label")
                        XCTAssert(emails[0].value == "kate-bell@mac.com", "Incorrect first email")
                        XCTAssert(emails[1].label == "work", "Incorrect second email label")
                        XCTAssert(emails[1].value == "www.icloud.com", "Incorrect second email")
                    }
                    XCTAssert(person.addresses != nil, "Address collection was nil")

import UIKit
import XCTest
import SwiftAddressBook
import AddressBook

//**** Run the example project first, to accept address book access ****
class SwiftAddressBookTests: XCTestCase {
