Addresses CR and ensures that we don't wait 10m for tests that should never take more than 5s.
Attach a file by drag & drop or click to upload
