Merge "test.py: stop using aliases for creds manager"