Change-Id: I7e79c6058f0303f9a98911e3b7dd2e8596079344
1. Moved around tests and added them to HIT Change-Id: I5d75280c42a5af852670ebabc7305ee56721ec7b
Change-Id: Iab1aee638b7158eb9674a19625dedf6471947e51