         super.tearDown()
     }
     
-    func testMappingWithContext() {
+	// MARK: - BaseMappable
+	// MARK: Single
+	func testMappingWithContext() {
 		let JSON = ["name": "Tristan"]
 		let context = Context(shouldMap: true)
 		

		XCTAssertNil(person?.name)
	}
	
	struct Context: MapContext {
		var shouldMap = false
		

		
		XCTAssertNotNil(person)
		XCTAssertNotNil(person?.name)
	}
	
	func testMappingWithContextViaMappableExtension() {
		let JSON = ["name": "Tristan"]
