Fix controller test cases