HDFS-5595: more descriptive names for tests
HDFS-5595: more tests, more fixes