Remove unused imports, make some test-only relevant import have scope test.
Remove unused imports, make some test-only relevant import have scope test.
Amend screwup caused by deleting the wrong direcctory of testcode.