update unit tests to rm locator dependency