Added index_holder
Added new tests