Cleanup tests: no more import *; remove unused