Fix tests 1

Change-Id: I672f829c5af27227161ad3b7d403fdcef434b97d