Added more locator controllers to common/ tests