 		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")
-		}
+
+		expect(mappedObject).notTo(beNil())
+		expect(mappedObject?.dictString[key]).to(equal(value))
+		expect(mappedObject?.dictStringOptional?[key]).to(equal(value))
+		expect(mappedObject?.dictStringImplicityUnwrapped[key]).to(equal(value))
 	}
 	
 	func testMappingAnyObjectDictionaryFromJSON(){

		var value: Double = 11
		let JSON = "{\"dictDouble\" : { \"\(key)\" : \(value)}, \"dictDoubleOpt\" : { \"\(key)\" : \(value)}, \"dictDoubleImp\" : { \"\(key)\" : \(value)} }"
		var mappedObject = mapper.map(string: JSON)
		
		if let mappedObject = mappedObject {
			let val1 = mappedObject.dictDoubleOptional?[key]
			XCTAssertEqual(val1!, value, "Optional Double Dictionary failed")
			
			let val2 = mappedObject.dictDoubleImplicityUnwrapped[key]
			XCTAssertEqual(val2!, value, "Implicity unwrapped optional Double Dictionary failed")
			
			let val3 = mappedObject.dictDouble[key]
			XCTAssertEqual(val3!, value, "Double Dictionary failed")
		} else {
			XCTAssert(false, "Double Dictionary to JSON failed")
		}
	}
	
	func testMappingFloatDictionaryFromJSON(){

		var value: Bool = true
		let JSON = "{\"dictBool\" : { \"\(key)\" : \(value)}, \"dictBoolOpt\" : { \"\(key)\" : \(value)}, \"dictBoolImp\" : { \"\(key)\" : \(value)} }"
		var mappedObject = mapper.map(string: JSON)

		expect(mappedObject).notTo(beNil())
		expect(mappedObject?.dictBoolOptional?[key]).to(equal(value))
		expect(mappedObject?.dictBoolImplicityUnwrapped[key]).to(equal(value))
		expect(mappedObject?.dictBool[key]).to(equal(value))
	}
	
	func testMappingIntDictionaryFromJSON(){
