Fix tests

Change-Id: I0b78eef807d0fbf0a552d4f98a0805a0c9fc1930