Fixed test issues

Change-Id: Iebf44d7bff598248fe1cda138ac1d8b4100775ba