Got ITs to pass, moved them to it package

Change-Id: I725a9fb252128393936d27eebc0cb0be54a56d4f
Removed test method

Change-Id: I85eeba1611f5642f0085dc159365d80975e9b0be