Updated some tests

Change-Id: I94f08b24a58654f0d2fa766353e3b290bbd08fcb