[Finishes #73592774, #72483828] couple more unit tests, and cursor change