Cursor support complete.
Package re-org.
Enable another test, and make tests use different collection names because they were interfering with each other.