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