         let json2: [String: AnyObject] = ["username": username, "identifier": identifier, "photoCount": photoCount]
         let user = User()
         Mapper().map(json2, toObject: user)
-        XCTAssertEqual(user.username, username, "Usernames should be the same")
-        XCTAssertEqual(user.identifier!, identifier, "identifiers should be the same")
-        XCTAssertEqual(user.photoCount, photoCount, "photo count should be the same")
+		expect(user.username).to(equal(username))
+		expect(user.identifier).to(equal(identifier))
+		expect(user.photoCount).to(equal(photoCount))
     }
     
 	func testNullObject() {
 		let userJSONString = "{\"username\":\"bob\"}"
-		
-		if let user = userMapper.map(string: userJSONString) {
-			XCTAssert(user.age == nil, "Username should be the same")
-		} else {
-			XCTAssert(false, "Null Object failed")
-		}
+
+		let user = userMapper.map(string: userJSONString)
+		expect(user).notTo(beNil())
+		expect(user?.age).to(beNil())
 	}
 	
 	func testToObjectFromString() {

        var s = Student()
        s.minor = minor
        let student = Mapper().map(json, toObject: s)
        
        XCTAssertEqual(student.name!, name, "Names should be the same")
        XCTAssertEqual(student.UUID!, UUID, "UUID should be the same")
        XCTAssertEqual(student.major!, major, "major should be the same")
        XCTAssertEqual(student.minor!, minor, "minor should be the same")
        
        //Test that mapping a reference type works as expected while not relying on the return value
        var username: String = "Barack Obama"
        var identifier: String = "Political"

		let JSON = "{ \"tasks\": [{\"taskId\":103,\"percentage\":\(percentage1)},{\"taskId\":108,\"percentage\":\(percentage2)}] }"
		
		let plan = Mapper<Plan>().map(string: JSON)

		let tasks = plan?.tasks
		expect(tasks).notTo(beNil())
		expect(tasks?[0].percentage).to(equal(percentage1))
		expect(tasks?[1].percentage).to(equal(percentage2))
	}
	
	func testDictionaryOfCustomObjects(){
