Refactor cursor specs