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