Add some more test cleaning
Move the tough2 test into a different directory

This stops its .hpc directory overlapping with that of the tough test,
which was causing test failures when running the testsuite in parallel.