 		
 		let mapper = Mapper<TestCollectionOfPrimitives>()
 		let testSet = mapper.map(json)
-		
-		XCTAssertTrue(testSet.dictStringString.count == 1)
-		XCTAssertTrue(testSet.dictStringInt.count == 1)
-		XCTAssertTrue(testSet.dictStringBool.count == 1)
-		XCTAssertTrue(testSet.dictStringDouble.count == 1)
-		XCTAssertTrue(testSet.dictStringFloat.count == 1)
-	}
-}+
+		expect(testSet.dictStringString).notTo(beEmpty())
+		expect(testSet.dictStringInt).notTo(beEmpty())
+		expect(testSet.dictStringBool).notTo(beEmpty())
+		expect(testSet.dictStringDouble).notTo(beEmpty())
+		expect(testSet.dictStringFloat).notTo(beEmpty())
+	}
+}

		var value: Bool = true
		let JSON = "{\"dictBool\" : { \"\(key)\" : \(value)}, \"dictBoolOpt\" : { \"\(key)\" : \(value)}, \"dictBoolImp\" : { \"\(key)\" : \(value)} }"
		var mappedObject = mapper.map(string: JSON)
		
		if let mappedObject = mappedObject {
			let val1 = mappedObject.dictBoolOptional?[key]
			XCTAssertEqual(val1!, value, "Optional Bool Dictionary failed")
			
			let val2 = mappedObject.dictBoolImplicityUnwrapped[key]
			XCTAssertEqual(val2!, value, "Implicity unwrapped optional Bool Dictionary failed")
			
			let val3 = mappedObject.dictBool[key]
			XCTAssertEqual(val3!, value, "Bool Dictionary failed")
		} else {
			XCTAssert(false, "Bool Dictionary to JSON failed")
		}
	}
	
	func testMappingIntDictionaryFromJSON(){

		let JSON = "{\"double\" : \(value), \"doubleOpt\" : \(value), \"doubleImp\" : \(value)}"

		var mappedObject = mapper.map(string: JSON)

		expect(mappedObject).notTo(beNil())
		expect(mappedObject?.double).to(equal(value))
		expect(mappedObject?.doubleOptional).to(equal(value))
		expect(mappedObject?.doubleImplicityUnwrapped).to(equal(value))
	}
	
	func testMappingFloatFromJSON(){
		var value: Float = 11
		let JSON = "{\"float\" : \(value), \"floatOpt\" : \(value), \"floatImp\" : \(value)}"
		var mappedObject = mapper.map(string: JSON)

		expect(mappedObject).notTo(beNil())
		expect(mappedObject?.float).to(equal(value))
		expect(mappedObject?.floatOptional).to(equal(value))
		expect(mappedObject?.floatImplicityUnwrapped).to(equal(value))
	}
	
	func testMappingStringFromJSON(){
