Add canAdvance to cursor and tests