added hadoop tests
merge branch