Fix test case for InstructorEvalEdit
Merge branch 'Issue2068' into bootstrap