Fixing to allow starting in non-debug mode
Updating based on archiving tests
Merge branch 'master' of github.com:klcodanr/Scripts