Partial work on improving OO and removing code smell, hdfs layer.  Mend HDFS tests.