MAPREDUCE-5809: correct several tests