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