Add ability to handle multiple cursors
Add test for multiple cursors based on existing tests