Now checking and masking env variables marked as sensitive. Some Test changes.