                     let rows = try Row.fetchAll(db, request)
                     XCTAssertEqual(rows.count, 3)
                     
-                    XCTAssertEqual(rows[0], ["cola1": 1, "cola2": "a1"])
+                    XCTAssertEqual(rows[0].unscoped, ["cola1": 1, "cola2": "a1"])
                     XCTAssertEqual(rows[0].prefetches.keys, ["bs"])
                     XCTAssertEqual(rows[0].prefetches["bs"]!.count, 2)
                     XCTAssertEqual(rows[0].prefetches["bs"]![0], ["colb1": 4, "colb2": 1, "colb3": "b1", "grdb_colb2": 1])
                     XCTAssertEqual(rows[0].prefetches["bs"]![1], ["colb1": 5, "colb2": 1, "colb3": "b2", "grdb_colb2": 1])
                     
-                    XCTAssertEqual(rows[1], ["cola1": 2, "cola2": "a2"])
+                    XCTAssertEqual(rows[1].unscoped, ["cola1": 2, "cola2": "a2"])
                     XCTAssertEqual(rows[1].prefetches.keys, ["bs"])
                     XCTAssertEqual(rows[1].prefetches["bs"]!.count, 1)
                     XCTAssertEqual(rows[1].prefetches["bs"]![0], ["colb1": 6, "colb2": 2, "colb3": "b3", "grdb_colb2": 2])
                     
-                    XCTAssertEqual(rows[2], ["cola1": 3, "cola2": "a3"])
+                    XCTAssertEqual(rows[2].unscoped, ["cola1": 3, "cola2": "a3"])
                     XCTAssertEqual(rows[2].prefetches.keys, ["bs"])
                     XCTAssertEqual(rows[2].prefetches["bs"]!.count, 0)
                 }

                do {
                    let row = try Row.fetchOne(db, request)!
                    
                    XCTAssertEqual(row, ["cola1": 1, "cola2": "a1"])
                    XCTAssertEqual(row.prefetches.keys, ["bs"])
                    XCTAssertEqual(row.prefetches["bs"]!.count, 2)
                    XCTAssertEqual(row.prefetches["bs"]![0], ["colb1": 4, "colb2": 1, "colb3": "b1", "grdb_colb2": 1])

                    XCTAssertEqual(rows[1].prefetches["cs"]!.count, 1)
                    XCTAssertEqual(rows[1].prefetches["cs"]![0], ["colc1": 7, "colc2": 1, "grdb_cola1": 1])
                    XCTAssertEqual(rows[1].scopes.count, 1)
                    XCTAssertEqual(rows[1].scopes["a"]!.unscoped, ["cola1": 1, "cola2": "a1"])
                    XCTAssertEqual(rows[1].scopes["a"]!.prefetches.keys, ["cs"])
                    XCTAssertEqual(rows[1].scopes["a"]!.prefetches["cs"]!.count, 1)
                    XCTAssertEqual(rows[1].scopes["a"]!.prefetches["cs"]![0], ["colc1": 7, "colc2": 1, "grdb_cola1": 1])
