 		let dict = ["test":NSNull()]
 		XCTAssertFalse(VALID(dict, "test"))
 	}
-
-	// MARK: VALID_AND_IS_CLASS
+}
+
+// MARK: VALID_AND_IS_CLASS
+
+extension DKHelperTests {
 
 	func test_ShouldVerifyValidClassValue() {
 		let dict = ["test":"string"]


// MARK: - Getters

extension DKHelperTests {

	// MARK: FLOAT

	func test_ShouldReturnFloatValue() {
		let dict = ["test":4.0]

	func test_ShouldReturnNilNumberFromNilDict() {
		XCTAssertNil(GET_NUMBER(nil, "test"))
	}
}

// MARK: DateFormat

extension DKHelperTests {

	func test_ShouldReturnValidDateAndIgnoreFormat() {
		let date = NSDate()
		let dict = ["test":date]
		let retrievedDate = GET_DATE_FORMAT(dict, "test", "xyz") as NSDate?
		XCTAssertNotNil(retrievedDate)
		XCTAssert(retrievedDate == date)
	}

	func test_ShouldReturnDateFromStringWithISOFormat() {
		let date = Date()
		let dict = ["test":NSString(from: date, format: NSDate.iso8601StringFormat())]
		XCTAssertEqual((GET_DATE_FORMAT(dict, "test", NSDate.iso8601StringFormat()) as NSDate?)?.stringValue(), (date as NSDate).stringValue())
	}

	func test_ShouldReturnDateFromStringWithISOFormatWithZ() {
		let date = Date()
		let dict = ["test":NSString(from: date, format: "yyyy'-'MM'-'dd'T'HH':'mm':'ssZ")]
		XCTAssertEqual((GET_DATE_FORMAT(dict, "test", "yyyy'-'MM'-'dd'T'HH':'mm':'ssZ") as NSDate?)?.stringValue(), (date as NSDate).stringValue())
	}

	func test_ShouldReturnDateFromStringWithISODateFormat() {
		let date = Date()
		let dict = ["test":NSString(from: date, format: "yyyy'-'MM'-'dd")]
		let receivedFormat = GET_DATE_FORMAT(dict, "test", "yyyy'-'MM'-'dd")
		XCTAssertEqual((date as NSDate).day(), (receivedFormat as NSDate?)?.day())
		XCTAssertEqual((date as NSDate).month(), (receivedFormat as NSDate?)?.month())
		XCTAssertEqual((date as NSDate).year(), (receivedFormat as NSDate?)?.year())
	}

	func test_ShouldReturnNilFromWrongISODateFormat() {
		let date = Date()
		let dict = ["test":NSString(from: date, format: "yyyy'-'MM'-'dd'T'HH':'mm':'ssZ")]
		let receivedFormat = GET_DATE_FORMAT(dict, "test", "yyyy'-'MM'-'dd")
		XCTAssertNil(receivedFormat)
	}

	func test_ShouldReturnNilFromInvalidDictWithFormat() {
		XCTAssert(GET_DATE_FORMAT(nil, "test", NSDate.iso8601StringFormat()) == nil)
	}

	func test_ShouldReturnNilFromInvalidKeyWithFormat() {
		let dict = ["test":Date()]
		XCTAssert(GET_DATE_FORMAT(dict, nil, NSDate.iso8601StringFormat()) == nil)
	}

	func test_ShouldReturnNilFromWrongKeyWithFormat() {
		let date = Date()
		let dict = ["test":date]
		XCTAssert(GET_DATE_FORMAT(dict, "second", NSDate.iso8601StringFormat()) == nil)
	}
}

// MARK: NSSTRING

extension DKHelperTests {

	func test_ShouldReturnValidString() {
		let dict = ["test":"value"]
		XCTAssert(GET_STRING(dict, "test") == "value")
	}

	func test_ShouldReturnNilOnEmptyStringObject() {
		let dict = ["test":""]
		XCTAssert(GET_STRING(dict, "test") == nil)
	}

	func test_ShouldReturnNilStringFromInvalidDict() {
		XCTAssert(GET_STRING(nil, "test") == nil)
	}

	func test_ShouldReturnNilStringFromInvalidKey() {
		let dict = ["test":Date()]
		XCTAssert(GET_STRING(dict, nil) == nil)
	}

	func test_ShouldReturnNilStringFromWrongKey() {
		let dict = ["test":Date()]
		XCTAssert(GET_STRING(dict, "second") == nil)
	}

	func test_ShouldReturnNilStringFromWrongValue() {
		let dict = ["test":4]
		XCTAssert(GET_STRING(dict, "test") == nil)
	}
}

// MARK: NSDATE

extension DKHelperTests {

	func test_ShouldReturnValidDate() {
		let date = NSDate()
