Test review comments updated for PR#1374

This PR contains the following changes

- Review comments updated for PR#1374.
- Updated recordings to have dummy credentials.
- Indent fixes.