Fixed ITs

Change-Id: I37548d76169788b10b4db80d36103b8c79ed046f