Feature/index tests