Fix tests

Change-Id: I4a0746791d4317571d882416cfe75e8a41edf08a