Integration Test Fixes- Reduce indexing time