HHH-7902 ResultSetExtractor -> ResultSetReturn.  Reworked proxy tests to
test the new APIs.