Feature/index tests

Fixed in afc97b1