Clean up logging and fix bug when retesting a repo with multiple schemes