#15 #26 Service unit tests