Fixed test cases.

Change-Id: I03a075cba3bdfe592cadbf811ad9b05be06d811f