improve index tests