Update tests

Change-Id: Iae04cc8db08b6fcb893a4d247eea25930c1d0a5b