add new changes in hadoop testing
merge branch