 		let JSON = "{\"dictInt\" : { \"\(key)\" : \(value)}, \"dictIntOpt\" : { \"\(key)\" : \(value)}, \"dictIntImp\" : { \"\(key)\" : \(value)} }"
 		
 		var mappedObject = mapper.map(string: JSON)
-		
-		if let mappedObject = mappedObject {
-			let val1 = mappedObject.dictIntOptional?[key]
-			XCTAssertEqual(val1!, value, "Optional Int Dictionary failed")
-			
-			let val2 = mappedObject.dictIntImplicityUnwrapped[key]
-			XCTAssertEqual(val2!, value, "Implicity unwrapped optional Int Dictionary failed")
-			
-			let val3 = mappedObject.dictInt[key]
-			XCTAssertEqual(val3!, value, "Int Dictionary failed")
-		} else {
-			XCTAssert(false, "Int Dictionary to JSON failed")
-		}
+
+		expect(mappedObject).notTo(beNil())
+		expect(mappedObject?.dictIntOptional?[key]).to(equal(value))
+		expect(mappedObject?.dictIntImplicityUnwrapped[key]).to(equal(value))
+		expect(mappedObject?.dictInt[key]).to(equal(value))
 	}
 	
 	func testMappingDoubleDictionaryFromJSON(){

		let JSON = "{\"dictString\" : { \"\(key)\" : \"\(value)\"}, \"dictStringOpt\" : { \"\(key)\" : \"\(value)\"}, \"dictStringImp\" : { \"\(key)\" : \"\(value)\"} }"
		
		var mappedObject = mapper.map(string: JSON)
		
		if let mappedObject = mappedObject {
			let val1 = mappedObject.dictString[key]
			XCTAssertEqual(val1!, value, "String Dictionary failed")
			
			let val2 = mappedObject.dictStringOptional?[key]
			XCTAssertEqual(val2!, value, "Optional String Dictionary failed")
		
			let val3 = mappedObject.dictStringImplicityUnwrapped[key]
			XCTAssertEqual(val3!, value, "Implicity unwrapped optional String Dictionary failed")
		} else {
			XCTAssert(false, "String Dictionary to JSON failed")
		}
	}
	
	func testMappingAnyObjectDictionaryFromJSON(){

		var value: Bool = true
		let JSON = "{\"bool\" : \(value), \"boolOpt\" : \(value), \"boolImp\" : \(value)}"
		var mappedObject = mapper.map(string: JSON)

		expect(mappedObject).notTo(beNil())
		expect(mappedObject?.bool).to(equal(value))
		expect(mappedObject?.boolOptional).to(equal(value))
		expect(mappedObject?.boolImplicityUnwrapped).to(equal(value))
	}
	
	func testMappingIntFromJSON(){
		var value: Int = 11
		let JSON = "{\"int\" : \(value), \"intOpt\" : \(value), \"intImp\" : \(value)}"
		var mappedObject = mapper.map(string: JSON)

		expect(mappedObject).notTo(beNil())
		expect(mappedObject?.int).to(equal(value))
		expect(mappedObject?.intOptional).to(equal(value))
		expect(mappedObject?.intImplicityUnwrapped).to(equal(value))
	}
	
	func testMappingDoubleFromJSON(){
