 		
 		let json = Mapper().toJSON(object)
 		let parsedObject = Mapper<Subclass>().map(json)
-		
-		XCTAssert(object.base! == parsedObject.base!, "base class var was not mapped")
-		XCTAssert(object.sub! == parsedObject.sub!, "sub class var was not mapped")
+
+		expect(object.base).to(equal(parsedObject.base))
+		expect(object.sub).to(equal(parsedObject.sub))
 	}
 
 	func testGenericSubclass() {

		user.username = "Tristan"
		
		Mapper().map(userJSON, toObject: user)
		
		XCTAssert(user.username == username, "Username should be the same")
	}
	
	func testToObjectFromAnyObject() {

		let JSON = "{\"taskId\":103,\"percentage\":\(percentage1)}"
		
		let task = Mapper<Task>().map(string: JSON)

		expect(task).notTo(beNil())
		expect(task?.percentage).to(equal(percentage1))
	}
	
	func testMappingAGenericObject(){
