Staging -> QA (test only)

Migrate test code changes made in the Staging branch for late I8 changes back to QA.