Fix tests 7

Change-Id: I607ab11158fc1fe0d05ed0f50b8b6b83bd8275d8