Reverted Hadoop test update (blocks following tests)