Added a couple of basic controller tests