Fix tests 6

Change-Id: Ie8728d5786abe1dc7a0a48a6ffa71d45a907b522