catching up test suite to updated indexing