New index impls and tests