Integration test fixes - Reduce indexing time