         XCTAssertNotNil(result.error, "result error should not be nil")
 
         if let error = result.error {
-            XCTAssertEqual(error.domain, "NSCocoaErrorDomain", "error domain should match expected value")
-            XCTAssertEqual(error.code, 3840, "error code should match expected value")
-        } else {
-            XCTFail("error should not be nil")
-        }
-    }
-
-    func testThatPropertyListResponseSerializerSucceedsWhenDataIsValidPropertyListData() {
-        // Given
-        let serializer = Request.propertyListResponseSerializer()
-        let data = NSKeyedArchiver.archivedDataWithRootObject(["foo": "bar"])
-
-        // When
-        let result = serializer.serializeResponse(nil, nil, data, nil)
-
-        // Then
-        XCTAssertTrue(result.isSuccess, "result is success should be true")
-        XCTAssertNotNil(result.value, "result value should not be nil")
-        XCTAssertNil(result.error, "result error should be nil")
-    }
-
-    func testThatPropertyListResponseSerializerFailsWhenDataIsInvalidPropertyListData() {
-        // Given
-        let serializer = Request.propertyListResponseSerializer()
-        let data = "definitely not valid plist data".dataUsingEncoding(NSUTF8StringEncoding)!
-
-        // When
-        let result = serializer.serializeResponse(nil, nil, data, nil)
-
-        // Then
-        XCTAssertTrue(result.isFailure, "result is failure should be true")
-        XCTAssertNil(result.value, "result value should be nil")
-        XCTAssertNotNil(result.error, "result error should not be nil")
-
-        if let error = result.error {
             XCTAssertEqual(error.domain, NSCocoaErrorDomain, "error domain should match expected value")
             XCTAssertEqual(error.code, 3840, "error code should match expected value")
         } else {

        XCTAssertNotNil(result.error, "result error should not be nil")

        if let error = result.error {
            XCTAssertEqual(error.domain, "NSCocoaErrorDomain", "error domain should match expected value")
            XCTAssertEqual(error.code, 3840, "error code should match expected value")
        } else {
            XCTFail("error should not be nil")

        }
    }

    func testThatPropertyListResponseSerializerSucceedsWhenDataIsValidPropertyListData() {
        // Given
        let serializer = Request.propertyListResponseSerializer()
        let data = NSKeyedArchiver.archivedDataWithRootObject(["foo": "bar"])

        // When
        let result = serializer.serializeResponse(nil, nil, data, nil)

        // Then
        XCTAssertTrue(result.isSuccess, "result is success should be true")
        XCTAssertNotNil(result.value, "result value should not be nil")
        XCTAssertNil(result.error, "result error should be nil")
    }

    func testThatPropertyListResponseSerializerFailsWhenDataIsInvalidPropertyListData() {
        // Given
        let serializer = Request.propertyListResponseSerializer()
        let data = "definitely not valid plist data".dataUsingEncoding(NSUTF8StringEncoding)!

        // When
        let result = serializer.serializeResponse(nil, nil, data, nil)

        // Then
        XCTAssertTrue(result.isFailure, "result is failure should be true")
        XCTAssertNil(result.value, "result value should be nil")
        XCTAssertNotNil(result.error, "result error should not be nil")

        if let error = result.error {
            XCTAssertEqual(error.domain, NSCocoaErrorDomain, "error domain should match expected value")
            XCTAssertEqual(error.code, 3840, "error code should match expected value")
        } else {
            XCTFail("error should not be nil")
        }
    }

    func testThatPropertyListResponseSerializerFailsWhenErrorIsNotNil() {
        // Given
        let serializer = Request.propertyListResponseSerializer()
