Refactored some cursor tests