I was finding the parallel test setup hard to read, so everything relating to one test is now in a single file, with shorter names.