Added locator tests