[TASK] Refactor controller unit test to expose a new base class
[TASK] Replace author annotations still using old email
Merge pull request #408 from NamelessCoder/testsagain

[TASK] Test refactoring