Fixed expect scripts

Change-Id: Ib843de0a5c1b9eaa1d7105f90509bee241be5723