Improve indexDiscovery tests performance
Merge pull request #897 from yemel/feature/test-performance

Improve performance of index discovery tests