WIP: Added some controller tests