Added more locator controllers to func tests