Fix tests

Change-Id: If70badfb90afc16541c79ac99255fc22d54aecf4