NXP-14007 improve indexing config + fix tests