Allow tests to have log files named different to the log type (take 2)