[TASK] Move building controller name into own method
[TASK] Basic controller fixture and test
Merge pull request #224 from NamelessCoder/duckandcover

[TASK] Cleanup and test coverage increase