Finish controller tests
Port the rest of the tests over