Making ITs work to some extent

Change-Id: I3dac7eb8be9f8d0f0d1aeca6450a2224f2767586