Locator changes for ui/repository tests.