And rename filenames in the testsuite that are too long.

Closes #626
(cherry picked from commit 9e332ef3)