HDFS-7106: test code cleanup