Improve OO and remove code smell, hdfs layer.  Mend HDFS tests.