Fix tests that used deprecated top-level .itp files

Change-Id: Ia26a420acc4b26bfeefd40fab8255d5deb0ad5d3