Add controller/service tests

Overall coverage from 57% to 65%