Progress on EntityIndex tests and imll.