         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")
-        
+
+		expect(student.name).to(equal(name))
+		expect(student.UUID).to(equal(UUID))
+		expect(student.major).to(equal(major))
+		expect(student.minor).to(equal(minor))
+
         //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)
		
		if let tasks = plan?.tasks {
			let task1 = tasks[0]
			XCTAssertEqual(task1.percentage!, percentage1, "Percentage 1 should be the same")
			
			let task2 = tasks[1]
			XCTAssertEqual(task2.percentage!, percentage2, "Percentage 2 should be the same")
		} else {
			XCTAssert(false, "Tasks not mapped")
		}
	}
	
	func testDictionaryOfCustomObjects(){

		user.username = "Tristan"
		
		Mapper().map(string: userJSONString, toObject: user)

		expect(user.username).to(equal(username))
	}
	
	func testToObjectFromJSON() {
