Merge "Give TestCase::checkHasDiff3 a better name"