New controller test
Merge pull request #11 from longtimeago/10

New controller test