More progress on query and index, some of the old IndexIT tests are passing now.