Merge pull request #133 from koszta/master

Improve the test coverage of services, controllers