Remove modifications to reset and paging iterator; instead modify the test to be able to handle the differences in the bindings