Renamed hdfs to hadoop for clarity
Updated tests