Refactor tests to new path.

BUG: 167961889
Test: TH
Change-Id: I2d4a9643a8c3a640784f7fa230cb376827b95fba
9 files changed