Rewrote ApplicationControllerTests to fit new code in service layer. Made some test refactoring. Separated test setups from tests code
Merge branch 'controller-tests'