fixing tests

Change-Id: I0a0b71c25a2a5460befc4e2495242aafb254c42d