More backports related test updates