fix test for 9.3+
add cursor support