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