finished service tests
Small changes