Merge "[WP2] Reorder TestInjector" into tm-qpr-dev