Added index tests for improved coverage