Update schema-test for both cursor types