Adding more tests for IT

Change-Id: I16d6fb7d10c10ffb9c06d924ed8a82fcb0726b30
Integrating with blueprint fixes and more tests

Change-Id: Ic6fb7087adb21ccf7059f6017f6715dd68c38fb8