#40 Create involved controller test
Merge branch 'dev' of https://github.com/Ornro/ThatNight into dev