Add Unit Tests for Services