Rename subdir/tough2 test to tough2