Modified locator contract, updated tests