Fix several test steps

Change-Id: Iaebf221aa636bfdadb45f500d240aedaa04ef5e4
Merge "Fix several test steps"