Change naming of output files to match those of scalatest. This allows
scalatest to overwrite them and remove double ups.