[REFACTOR] Move and refactor tests. am: c049f93549 am: 644ffc0792 am: a120174a30 am: 48e9b82f9c
am: 0dca8fa77d

Change-Id: I085ea5e4312f8f063e5f955d1c8cf45a2d699dd8