Bug 58053 - Fix relative imports in tests/

Change-Id: I3c2ed53356d2f01c6929ab8d5c876020080fd0c3
Merge "Bug 58053 - Fix relative imports in tests/"