Some changes in tests in app-service