Make private and removed service available in tests...