Move tests to .test package am: f24590f6c9
am: 6afec2ab78

Change-Id: I0ecfc8ece0a16679d4d777f5261513479840390c