[ASFXSWB667] rename to ensure index since that is what it does and fix tests