Consolidate indicator controller and controller tests