* Have _warpToCurrentIndex() shortcut logic behave properly

* Add test

* Apply code review

* Fix typo (fromm -> from)