Improved test speed slightly
Improved stopping logic of ProjectIndexJob slightly