Added tests for fix on index-based block selection.