Improve OO and remove code smell, hdfs layer.  Mend HDFS tests.
Revert changes in hdfs.py.
Fix merge issues in _hdfs_test.