performance improvement
Merge pull request #753 from yemel/performance/index-discovery-test

Small test refactor for performance