Merge "Change CLI tests to use auth providers"