Fix tests 2

Change-Id: Ifc2fb82ffbe0d952ec715340b0790b3912cbcb0b