Merge "Removing local service in test setup"