Service Unit Test additions