More unit test work around the service layer