Fix tests for new locators