No need for subfolders if tests not divided.
Changing input and output files in line with other tests.
Moving piplinks out of subfolder.