Fix broken controller testcases