New controller tests
More more more tests