Update gxf regression tests because of r25399