Added more service tests.