Fix tests 4

Change-Id: I8be9838b10976bd662c6c86a3fa5a7c71ffe666f