Fix tests

Change-Id: If5d27d557bddfc2828011e8d2cc7922f970a0abd