Added some more basic unit tests for services