etc: Fix test combiner for core->std/std->extra change. rs=burningtree