Clean up some of the CachingTargetLocatorTest tests