US5996: Further (and hopefully final) changes to RC E2E Prod tests