extracting the code the resolves tokens to make it easier to test the token replacement
wrapping the use of Repository in a using statement
Adding current-repo-aware tests for repo-dependent token replacements
adding the replacement tokens for %user%, %machine%, and %env[arg]% where arg is resolved as a lookup into the Environment Variables collection