enhance and add tests to LookupLocators