Fixed data file names in Makefile.
Reordered ISO images in testsuite Makefile.