HDFS-2856: fix some compilation errors in test code