Merge "Drop any dependency from config in test_credentials"