Rename test files, to reflect class name changes.
Further integeration with TargetLocator.

Now we can get rid of the IndexCache completely.