Re-port test project changes from release/2.0.0 to master (#13464)