Corrected tests that start to fail after change HADOOP-9357.