Add more controller tests

![image](https://f.cloud.github.com/assets/3342894/1679158/8b0dd21a-5d47-11e3-8479-28b4832733f3.png)