Updated Unit Tests with new Services Architecture