Merge "Ease modifying the test list in E2E testing" into stable/hunter