Fix SCHOLAR-3.x tests and split them

#5628