Merge "Add the test name that is too long for diagnosing issues."