Merge "Initial class creds creation in test base class"