Update bulk indexing to support multiple indexors, updates tests to support