Fix broken test cases for long|short questions.