Fix SCHOLAR-3.x tests

#5628