HADOOP-9258 - more tests
HADOOP-9265 -renaming