Merge "Make test-logs.sh more convenient to use"