use a different property to get the current username, instead of Credentials
fixed up the last remaining tests for references
ensure we wait to tidy up the repository before continuing