Fix unit tests to use new locator strings