Split up tests. Appease Scrutinizer
Merge pull request #58 from baldurrensch/split_tests

Split up controller tests. Appease Scrutinizer