Move tests from tests/ root dir to appropriate directory. am: 0357e3dab0 am: 5eb56cd027
am: 00ab5e4862

Change-Id: I69f50fb440b8eacc46ce825257ac83f86a3076b6