This is for credentials testing.  No serious changes.