Move tests to .test package
am: f24590f6c9

Change-Id: I9f9bb5156972b312222cfd665d678425d3723861