Controller/service tests

Overall coverage from 57% to 65%

Related to issue #79