WIP - more testing changes against new credentials overrides