HDFS-5642: more test code fixes