Renamed test classes

Change-Id: I9e0a4c1997e576ff30d1be932634576c3480f5df
Merge "Renamed test classes"