Progress on EntityIndex tests and impl.