Added main controller tests