Work on cursor tests