We don't care about target ID features in this test, so we can simply strip them away to maintain compatability with the internal test table. Change-Id: I44591a052c02f9e01876a8946f99cfedee371233