added refactoring hadoop tests
merge branches