HDFS-5642: more test clean-up.