De-duplicated test directory names again

4 jobs for !81 with tidy-up-tests in 10 seconds (queued for 1 second)
latest merge request